diff --git a/inc/inc.ClassEmailNotify.php b/inc/inc.ClassEmailNotify.php
index ec0753aad..d1481fab4 100644
--- a/inc/inc.ClassEmailNotify.php
+++ b/inc/inc.ClassEmailNotify.php
@@ -220,7 +220,7 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 					$ret = $queueService->queueMailJob($mail_params, $to, $hdrs, getMLText($subject, $params, "", $lang), $message);
 					if($ret !== null)
 						return $ret;
-        }
+				}
 			}
 		}
 		$result = $mail->send($to, $hdrs, $message);
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index c3b108042..f3473a44f 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1187,7 +1187,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	function formField($title, $value, $params=array()) { /* {{{ */
 		if($title !== null) {
 			echo "<div class=\"control-group\">";
-			echo "	<label class=\"control-label\"".(!empty($params['help']) ? " title=\"".$params['help']."\" style=\"cursor: help;\"" : "").">".$title.":</label>";
+			echo "	<label class=\"control-label\"".(!empty($params['help']) ? " title=\"".$params['help']."\" style=\"cursor: help;\"" : "").(!empty($value['id']) ? ' for="'.$value['id'].'"' : '').">".$title.":</label>";
 			echo "	<div class=\"controls\">";
 		}
 		if(isset($params['field_wrap'][0]))
diff --git a/views/bootstrap/class.Login.php b/views/bootstrap/class.Login.php
index aeb23bd7b..07c59d17b 100644
--- a/views/bootstrap/class.Login.php
+++ b/views/bootstrap/class.Login.php
@@ -148,27 +148,35 @@ $(document).ready( function() {
 			);
 		}
 		if($enableLanguageSelector) {
-			$html = "<select id=\"languageselector\" class=\"form-control\" name=\"lang\">";
-			$html .= "<option value=\"\">-";
+			$options = array();
+			$options[] = array('', '-');
 			foreach ($languages as $currLang) {
-				$html .= "<option value=\"".$currLang."\">".getMLText($currLang)."</option>";
+				$options[] = array($currLang, getMLText($currLang));
 			}
-			$html .= "</select>";
 			$this->formField(
 				getMLText("language"),
-				$html
+				array(
+					'element'=>'select',
+					'name'=>'lang',
+					'id'=>'languageselector',
+					'options'=>$options
+				)
 			);
 		}
 		if($enableThemeSelector) {
-			$html = "<select id=\"themeselector\" class=\"form-control\" name=\"sesstheme\">";
-			$html .= "<option value=\"\">-";
+			$options = array();
+			$options[] = array('', '-');
 			foreach ($themes as $currTheme) {
-				$html .= "<option value=\"".$currTheme."\">".$currTheme;
+				$options[] = array($currTheme, $currTheme);
 			}
-			$html .= "</select>";
 			$this->formField(
 				getMLText("theme"),
-				$html
+				array(
+					'element'=>'select',
+					'name'=>'sesstheme',
+					'id'=>'themeselector',
+					'options'=>$options
+				)
 			);
 		}
 		$this->formSubmit(getMLText('submit_login'));