diff --git a/build.xml b/build.xml
index 265e6c1e8..34f22a802 100644
--- a/build.xml
+++ b/build.xml
@@ -257,13 +257,13 @@
 						</replaceregexp>
 					</filterchain>
 				</copy>
+				<exec executable="ln" passthru="true" dir="${builddir}/export/${shortversion}">
+					<arg line="-s seeddms-${version} seeddms" />
+				</exec>
 				<phingcall target="composer">
 					<property name="composer_extra_params" value="--working-dir=${builddir}/export/${shortversion}/" />
 					<property name="composer_envv" value="COMPOSER=${srcdir}/composer-dist.json" />
 				</phingcall>
-				<exec executable="ln" passthru="true" dir="${builddir}/export/${shortversion}">
-					<arg line="-s seeddms-${version} seeddms" />
-				</exec>
 				<exec executable="ln" passthru="true" dir="${builddir}/export/${shortversion}/www">
 					<arg line="-s ../seeddms/op" />
 				</exec>
diff --git a/composer-dist.json b/composer-dist.json
index b77e8ab6c..e108080b0 100644
--- a/composer-dist.json
+++ b/composer-dist.json
@@ -22,7 +22,7 @@
          "psr-4": {
              "SeedDMS\\Console\\": "seeddms/utils"
          },
-         "classmap": ["seeddms/inc/inc.ClassTranslator.php", "seeddms/inc/inc.ClassSettings.php", "seeddms/inc/inc.Version.php", "inc/inc.ClassViewCommon.php", "inc/inc.ClassControllerCommon.php", "inc/inc.ClassController.php"]
+         "classmap": ["seeddms/inc/inc.ClassTranslator.php", "seeddms/inc/inc.ClassSettings.php", "seeddms/inc/inc.Version.php", "seeddms/inc/inc.ClassViewCommon.php", "seeddms/inc/inc.ClassControllerCommon.php", "seeddms/inc/inc.ClassController.php"]
     },
     "require": {
         "pear/http_request2": "^2",
diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 2b84527b7..4804eb46c 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -1972,7 +1972,7 @@ class Settings { /* {{{ */
 			return $this->_availablelanguages;
 		}
 
-		return getAvailableLanguages();
+		return self::getAvailableLanguages();
 	} /* }}} */
 
 } /* }}} */
diff --git a/op/op.Login.php b/op/op.Login.php
index 40ea3051c..f8a3d3632 100644
--- a/op/op.Login.php
+++ b/op/op.Login.php
@@ -63,7 +63,7 @@ if(isset($_POST['pwd'])) {
 }
 
 $lang = '';
-if(isset($_REQUEST["lang"]) && strlen($_REQUEST["lang"])>0 && is_numeric(array_search($_REQUEST["lang"],getLanguages())) ) {
+if(isset($_REQUEST["lang"]) && strlen($_REQUEST["lang"])>0 && is_numeric(array_search($_REQUEST["lang"],$settings->getLanguages())) ) {
 	$lang = (string) $_REQUEST["lang"];
 }
 
diff --git a/out/out.Login.php b/out/out.Login.php
index ce2f4c281..077751c34 100644
--- a/out/out.Login.php
+++ b/out/out.Login.php
@@ -56,7 +56,7 @@ if($view) {
 	$view->setParam('referrer', $refer);
 	$view->setParam('themes', $themes);
 	$view->setParam('msg', $msg);
-	$view->setParam('languages', getLanguages());
+	$view->setParam('languages', $settings->getLanguages());
 	$view->setParam('enablelanguageselector', $settings->_enableLanguageSelector);
 	$view->setParam('enablethemeselector', $settings->_enableThemeSelector);
 	$view->setParam('enable2factauth', $settings->_enable2FactorAuthentication);
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index c279c2cc9..d3985eedc 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -744,14 +744,18 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	<ul class="dropdown-menu">
 ';
 			foreach($button['menuitems'] as $menuitem) {
-				$content .= '
+				if(is_array($menuitem)) {
+					$content .= '
 		<li><a';
-				if(!empty($menuitem['link']))
-					$content .= ' href="'.$menuitem['link'].'"';
-				if(!empty($menuitem['onclick']))
-					$content .= ' onclick="'.$menuitem['onclick'].'"';
-				$content .= '>'.$menuitem['label'].'</a><li>
+					if(!empty($menuitem['link']))
+						$content .= ' href="'.$menuitem['link'].'"';
+					if(!empty($menuitem['onclick']))
+						$content .= ' onclick="'.$menuitem['onclick'].'"';
+					$content .= '>'.$menuitem['label'].'</a><li>
 ';
+				} else {
+					$content .= $menuitem;
+				}
 			}
 			$content .= '
 	</ul>
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 41746d537..1a5d2e910 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -677,14 +677,18 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	<div class="dropdown-menu">
 ';
 			foreach($button['menuitems'] as $menuitem) {
-				$content .= '
+				if(is_array($menuitem)) {
+					$content .= '
 		<a class="dropdown-item"';
-				if(!empty($menuitem['link']))
-					$content .= ' href="'.$menuitem['link'].'"';
-				if(!empty($menuitem['onclick']))
-					$content .= ' onclick="'.$menuitem['onclick'].'"';
-				$content .= '>'.$menuitem['label'].'</a>
+					if(!empty($menuitem['link']))
+						$content .= ' href="'.$menuitem['link'].'"';
+					if(!empty($menuitem['onclick']))
+						$content .= ' onclick="'.$menuitem['onclick'].'"';
+					$content .= '>'.$menuitem['label'].'</a>
 ';
+				} else {
+					$content .= $menuitem;
+				}
 			}
 			$content .= '
 	</div>