Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f -r098532cd2b5687da032408b04a1120dab668083b
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 098532cd2b5687da032408b04a1120dab668083b)
@@ -252,6 +252,7 @@
 config.learner.client.version  =Learner client version
 config.server.version.number  =Server version number
 config.server.language  =Locale
+config.server.country =Country
 config.server.page.direction  =Locale page direction
 config.dictionary.date.created  =Language pack install date
 config.help.url  =Help URL
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ConfigAction.java
===================================================================
diff -u -r85ef8aca5722a36582117db1e8b988e2c16b6369 -r098532cd2b5687da032408b04a1120dab668083b
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ConfigAction.java	(.../ConfigAction.java)	(revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ConfigAction.java	(.../ConfigAction.java)	(revision 098532cd2b5687da032408b04a1120dab668083b)
@@ -33,6 +33,7 @@
 import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
 import org.lamsfoundation.lams.config.ConfigurationItem;
 import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.LanguageUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 
@@ -73,6 +74,7 @@
 	    HttpServletResponse response) throws Exception {
 
 	request.setAttribute("config", getConfiguration().arrangeItems(Configuration.ITEMS_NON_LDAP));
+	request.setAttribute("countryCodes", LanguageUtil.getCountryCodes(false));
 
 	return mapping.findForward("config");
     }
@@ -120,7 +122,7 @@
 	    }
 	}
 	getConfiguration().persistUpdate();
-	
+
 	Configuration.refreshCache();
 
 	return mapping.findForward("sysadmin");
Index: lams_admin/web/config/items.jsp
===================================================================
diff -u -rdf0635da539415b89e42b4ce83da50f8fe3b272e -r098532cd2b5687da032408b04a1120dab668083b
--- lams_admin/web/config/items.jsp	(.../items.jsp)	(revision df0635da539415b89e42b4ce83da50f8fe3b272e)
+++ lams_admin/web/config/items.jsp	(.../items.jsp)	(revision 098532cd2b5687da032408b04a1120dab668083b)
@@ -18,6 +18,15 @@
 						<html:hidden property="key" name="key" value="${row.key}"/>
 						<c:set var="BOOLEAN"><%= ConfigurationItem.BOOLEAN_FORMAT %></c:set>
 						<c:choose>
+						<c:when test="${row.key == 'ServerCountry'}">
+							<html:select styleId="${row.key}" name="row" property="value" styleClass="form-control form-control-sm">
+								<c:forEach items="${countryCodes}" var="countryCode">
+									<html:option value="${countryCode.key}" >
+										${countryCode.value}
+									</html:option>
+								</c:forEach>
+							</html:select>
+						</c:when>
 						<c:when test="${row.format==BOOLEAN}">
 							<html:select styleId="${row.key}" name="row" property="value" styleClass="form-control form-control-sm">
 							<html:option value="true">true</html:option>
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r16d743c4864364650d7a51965bafc112eefcb86f -r098532cd2b5687da032408b04a1120dab668083b
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180708.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180708.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180708.sql	(revision 098532cd2b5687da032408b04a1120dab668083b)
@@ -0,0 +1,15 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-4625 Add default country in sysadmin menu
+INSERT INTO lams_configuration (config_key, config_value, description_key, header_name, format, required)
+VALUES ('ServerCountry','AU', 'config.server.country', 'config.header.look.feel', 'STRING', 1);
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
===================================================================
diff -u -r68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f -r098532cd2b5687da032408b04a1120dab668083b
--- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	(.../IntegrationService.java)	(revision 68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	(.../IntegrationService.java)	(revision 098532cd2b5687da032408b04a1120dab668083b)
@@ -292,8 +292,8 @@
 
 	if (extUserUseridMap == null) {
 	    String[] defaultLangCountry = LanguageUtil.getDefaultLangCountry();
-	    String[] userData = { "", firstName, lastName, "", "", "", "", "", "", "", "", email, defaultLangCountry[1],
-		    defaultLangCountry[0] };
+	    String[] userData = { "", firstName, lastName, "", "", "", "", LanguageUtil.getDefaultCountry(), "", "", "",
+		    email, defaultLangCountry[1], defaultLangCountry[0] };
 	    return createExtUserUseridMap(extServer, extUsername, password, salt, userData, false);
 	} else {
 	    return extUserUseridMap;
@@ -438,10 +438,7 @@
 	//set user's country to default value if it wasn't provided or has a wrong value
 	String country = userData[7];
 	if (StringUtils.isBlank(country) || !Arrays.asList(CommonConstants.COUNTRY_CODES).contains(country)) {
-	    country = userData[13];
-	    if (StringUtils.isBlank(country) || !Arrays.asList(CommonConstants.COUNTRY_CODES).contains(country)) {
-		country = LanguageUtil.getDefaultLangCountry()[1];
-	    }
+	    country = LanguageUtil.getDefaultCountry();
 	}
 
 	User user = new User();
Index: lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java
===================================================================
diff -u -ra1046dbdfb10ad1f7a61b8d50acbff46ac7c96ab -r098532cd2b5687da032408b04a1120dab668083b
--- lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java	(.../SignupService.java)	(revision a1046dbdfb10ad1f7a61b8d50acbff46ac7c96ab)
+++ lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java	(.../SignupService.java)	(revision 098532cd2b5687da032408b04a1120dab668083b)
@@ -163,7 +163,7 @@
     private SupportedLocale getDefaultLocale() {
 	String localeName = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE);
 	String langIsoCode = LanguageUtil.DEFAULT_LANGUAGE;
-	String countryIsoCode = LanguageUtil.getDefaultCountry();
+	String countryIsoCode = LanguageUtil.DEFAULT_COUNTRY;
 	if (StringUtils.isNotBlank(localeName) && localeName.length() > 2) {
 	    langIsoCode = localeName.substring(0, 2);
 	    countryIsoCode = localeName.substring(3);
Index: lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java
===================================================================
diff -u -ra1046dbdfb10ad1f7a61b8d50acbff46ac7c96ab -r098532cd2b5687da032408b04a1120dab668083b
--- lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java	(.../LanguageUtil.java)	(revision a1046dbdfb10ad1f7a61b8d50acbff46ac7c96ab)
+++ lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java	(.../LanguageUtil.java)	(revision 098532cd2b5687da032408b04a1120dab668083b)
@@ -81,7 +81,7 @@
 	    languageIsoCode = LanguageUtil.DEFAULT_LANGUAGE;
 	}
 	if (countryIsoCode == null) {
-	    languageIsoCode = LanguageUtil.getDefaultCountry();
+	    languageIsoCode = LanguageUtil.DEFAULT_COUNTRY;
 	}
 
 	return new String[] { languageIsoCode, countryIsoCode };
@@ -117,7 +117,7 @@
 	String localeName = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE);
 	String langIsoCode = LanguageUtil.DEFAULT_LANGUAGE;
 	// try to use the server's country first
-	String countryIsoCode = LanguageUtil.getDefaultCountry();
+	String countryIsoCode = LanguageUtil.DEFAULT_COUNTRY;
 	if (StringUtils.isNotBlank(localeName) && (localeName.length() > 2)) {
 	    langIsoCode = localeName.substring(0, 2);
 	    countryIsoCode = localeName.substring(3);