diff --git a/view/templates/field_checkbox.tpl b/view/templates/field_checkbox.tpl
index b66cced87..8275d4595 100644
--- a/view/templates/field_checkbox.tpl
+++ b/view/templates/field_checkbox.tpl
@@ -1,6 +1,8 @@
 	<div class="field checkbox" id="div_id_{{$field.0}}">
-		<label for="id_{{$field.0}}">{{$field.1}}</label>
+		<label id="id_{{$field.0}}_label" for="id_{{$field.0}}">{{$field.1}}</label>
 		<input type="hidden" name="{{$field.0}}" value="0">
 		<input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" aria-describedby="{{$field.0}}_tip" value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.4}}{{$field.4}}{{/if}}>
+		{{if $field.3}}
 		<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_combobox.tpl b/view/templates/field_combobox.tpl
index 458655016..876e607cd 100644
--- a/view/templates/field_combobox.tpl
+++ b/view/templates/field_combobox.tpl
@@ -13,6 +13,8 @@
 			{{foreach $field.4 as $opt=>$val}}<option value="{{$val|escape:'html'}}">{{$val}}</option>{{/foreach}}
 		</select>
 		
-		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+		{{if $field.3}}
+		<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+		{{/if}}
 	</div>
 
diff --git a/view/templates/field_custom.tpl b/view/templates/field_custom.tpl
index 0b0928402..6649b0ff9 100644
--- a/view/templates/field_custom.tpl
+++ b/view/templates/field_custom.tpl
@@ -3,5 +3,7 @@
 	<div class='field custom'>
 		<label for='{{$field.0}}'>{{$field.1}}</label>
 		{{$field.2}}
-		<span class='field_help'>{{$field.3}}</span>
+		{{if $field.3}}
+		<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_input.tpl b/view/templates/field_input.tpl
index 495493f2f..850656bb8 100644
--- a/view/templates/field_input.tpl
+++ b/view/templates/field_input.tpl
@@ -2,5 +2,7 @@
 	<div class='field input' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<input{{if $field.6 eq 'email'}} type='email'{{elseif $field.6 eq 'url'}} type='url'{{else}} type="text"{{/if}} name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2|escape:'html'}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby='{{$field.0}}_tip'>
+		{{if $field.3}}
 		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_intcheckbox.tpl b/view/templates/field_intcheckbox.tpl
index 73bdf6041..9c5f04e79 100644
--- a/view/templates/field_intcheckbox.tpl
+++ b/view/templates/field_intcheckbox.tpl
@@ -3,5 +3,7 @@
 	<div class='field checkbox'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3|escape:'html'}}" {{if $field.2}}checked="true"{{/if}} aria-describedby='{{$field.0}}_tip'>
+		{{if $field.4}}
 		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.4}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_openid.tpl b/view/templates/field_openid.tpl
index 062ac6ac6..9a18bbc13 100644
--- a/view/templates/field_openid.tpl
+++ b/view/templates/field_openid.tpl
@@ -2,5 +2,7 @@
 	<div class='field input openid' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<input name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2|escape:'html'}}" aria-describedby='{{$field.0}}_tip'>
-		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+		{{if $field.3}}
+		<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_password.tpl b/view/templates/field_password.tpl
index 333ce67c3..4b4d4f2b2 100644
--- a/view/templates/field_password.tpl
+++ b/view/templates/field_password.tpl
@@ -2,5 +2,7 @@
 	<div class='field password' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2|escape:'html'}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq 'autofocus'}} autofocus{{/if}} aria-describedby='{{$field.0}}_tip'>
+		{{if $field.3}}
 		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_radio.tpl b/view/templates/field_radio.tpl
index 6b880ed99..1e1d8e0b1 100644
--- a/view/templates/field_radio.tpl
+++ b/view/templates/field_radio.tpl
@@ -1,5 +1,7 @@
 	<div class='field radio'>
 		<label for='id_{{$field.0}}_{{$field.2}}'>{{$field.1}}</label>
 		<input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2|escape:'html'}}" {{if $field.4}}checked{{/if}} aria-describedby={{$field.0}}_{{$field.2}}_tip'>
+		{{if $field.3}}
 		<span class='field_help' role='tooltip' id='{{$field.0}}_{{$field.2}}_tip'>{{$field.3}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_richtext.tpl b/view/templates/field_richtext.tpl
index 67553bb95..bc346ddb0 100644
--- a/view/templates/field_richtext.tpl
+++ b/view/templates/field_richtext.tpl
@@ -3,5 +3,7 @@
 	<div class='field richtext'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<textarea name='{{$field.0}}' id='id_{{$field.0}}' class="fieldRichtext" aria-describedby='{{$field.0}}_tip'>{{$field.2}}</textarea>
-		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+		{{if $field.3}}
+		<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_select.tpl b/view/templates/field_select.tpl
index 2d037439d..87a2ab9ff 100644
--- a/view/templates/field_select.tpl
+++ b/view/templates/field_select.tpl
@@ -5,5 +5,7 @@
 		<select name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>
 			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt|escape:'html'}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
 		</select>
-		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+		{{if $field.3}}
+		<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_select_raw.tpl b/view/templates/field_select_raw.tpl
index 4c826a042..147c028ef 100644
--- a/view/templates/field_select_raw.tpl
+++ b/view/templates/field_select_raw.tpl
@@ -5,5 +5,7 @@
 		<select name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>
 			{{$field.4}}
 		</select>
-		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+		{{if $field.3}}
+		<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_textarea.tpl b/view/templates/field_textarea.tpl
index c37537d6e..60594a266 100644
--- a/view/templates/field_textarea.tpl
+++ b/view/templates/field_textarea.tpl
@@ -3,5 +3,7 @@
 	<div class='field textarea'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<textarea name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>{{$field.2}}</textarea>
-		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+		{{if $field.3}}
+		<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_themeselect.tpl b/view/templates/field_themeselect.tpl
index 51f6057ae..5f56c187e 100644
--- a/view/templates/field_themeselect.tpl
+++ b/view/templates/field_themeselect.tpl
@@ -5,6 +5,8 @@
 		<select name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5}}onchange="previewTheme(this);"{{/if}} aria-describedby='{{$field.0}}_tip'>
 			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt|escape:'html'}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
 		</select>
-		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+		{{if $field.3}}
+		<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+		{{/if}}
 		{{if $field.5}}<div id="theme-preview"></div>{{/if}}
 	</div>
diff --git a/view/templates/field_yesno.tpl b/view/templates/field_yesno.tpl
index 155d0488b..7e7c3cc4e 100644
--- a/view/templates/field_yesno.tpl
+++ b/view/templates/field_yesno.tpl
@@ -10,5 +10,7 @@
 				{{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}}
 			</a>
 		</div>
-		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+		{{if $field.3}}
+		<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/login.tpl b/view/templates/login.tpl
index e1e8c5f3a..029ebb034 100644
--- a/view/templates/login.tpl
+++ b/view/templates/login.tpl
@@ -4,11 +4,14 @@
 <div id="login-group" role="group" aria-labelledby="login-head">
 	<input type="hidden" name="auth-params" value="login" />
 
-	<div id="login-head" class="sr-only">{{$login}}</div>
+	<h3 id="login-head" class="sr-only">{{$login}}</h3>
 
 	<div id="login_standard">
 	{{include file="field_input.tpl" field=$lname}}
 	{{include file="field_password.tpl" field=$lpassword}}
+	<div id="login-lost-password-link">
+		<a href="lostpass" title="{{$lostpass|escape:'html'}}" id="lost-password-link" >{{$lostlink}}</a>
+	</div>
 	</div>
 	
 	{{if $openid}}
@@ -17,16 +20,11 @@
 		</div>
 	{{/if}}
 
-	{{include file="field_checkbox.tpl" field=$lremember}}
-
-	<div id="login-extra-links">
-		{{if $register}}<a href="register" title="{{$register.title|escape:'html'}}" id="register-link">{{$register.desc}}</a>{{/if}}
-		<a href="lostpass" title="{{$lostpass|escape:'html'}}" id="lost-password-link" >{{$lostlink}}</a>
-	</div>
-	
 	<div id="login-submit-wrapper" >
 		<input type="submit" name="submit" id="login-submit-button" value="{{$login|escape:'html'}}" />
 	</div>
+
+	{{include file="field_checkbox.tpl" field=$lremember}}
 	
 	{{foreach $hiddens as $k=>$v}}
 		<input type="hidden" name="{{$k}}" value="{{$v|escape:'html'}}" />
@@ -35,5 +33,11 @@
 </div>
 </form>
 
+{{if $register}}
+<div id="login-extra-links">
+	<h3 id="login-head" class="sr-only">{{$register.title|escape:'html'}}</h3>
+	<a href="register" title="{{$register.title|escape:'html'}}" id="register-link">{{$register.desc}}</a>
+</div>
+{{/if}}
 
 <script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 912c6a884..0d611de41 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -3137,12 +3137,30 @@ section .profile-match-wrapper {
  * Login page
  */
 #login-submit-wrapper {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-    align-items: center;
+    float: right;
 }
 #lost-password-link { flex-grow: 2; }
+#login-lost-password-link {
+    margin-bottom: 10px;
+    float: right;
+}
+#div_id_remember {
+    float: left;
+}
+#id_password_wrapper {
+    margin-bottom: unset;
+}
+#login_openid {
+    clear: both;
+}
+#register-link {
+    color: white;
+    background: #8ad0a1;
+    width: 100%;
+}
+#login-end {
+    clear: both;
+}
 
 .mod-home.is-not-singleuser,
 .mod-login {
@@ -3167,12 +3185,16 @@ section .profile-match-wrapper {
     margin-top: 2.5%;
 }
 
+.mod-home.is-not-singleuser .login-form > #login-extra-links {
+    margin-top: 4em;
+    margin-bottom: 1em;
+}
+
 .mod-home.is-not-singleuser .login-form > #login-form label,
 .mod-login #content #login-form label {
     color: #eee;
 }
 
-
 .mod-home.is-not-singleuser .login-panel-content,
 .mod-login .login-panel-content {
     background-color: rgba(255,255,255,.85);
@@ -3186,12 +3208,17 @@ section .profile-match-wrapper {
     }
 
     .mod-home.is-not-singleuser .login-form > #login-form,
+    .mod-home.is-not-singleuser .login-form > #login-extra-links,
     .mod-login #content #login-form {
         background-color: #fff;
         padding: 1em;
         position: relative;
         margin-top: 4em;
     }
+    .mod-home.is-not-singleuser .login-form > #login-extra-links {
+        margin-top: unset;
+        background-color: white;
+    }
 
     .mod-home.is-not-singleuser .login-form > #login-form label,
     .mod-login #content #login-form label {
diff --git a/view/theme/frio/templates/field_checkbox.tpl b/view/theme/frio/templates/field_checkbox.tpl
index 787a82ebd..1fde3634a 100644
--- a/view/theme/frio/templates/field_checkbox.tpl
+++ b/view/theme/frio/templates/field_checkbox.tpl
@@ -4,6 +4,8 @@
 			<input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="1" {{if $field.2}}checked="checked"{{/if}} aria-checked="{{if $field.2}}true{{else}}false{{/if}}" aria-describedby="{{$field.0}}_tip" {{if $field.4}}{{$field.4}}{{/if}}>
 			<label for="id_{{$field.0}}">
 				{{$field.1}}
+				{{if $field.3}}
 				<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+				{{/if}}
 			</label>
-	</div>
\ No newline at end of file
+	</div>
diff --git a/view/theme/frio/templates/field_colorinput.tpl b/view/theme/frio/templates/field_colorinput.tpl
index 886d647e9..704db346d 100644
--- a/view/theme/frio/templates/field_colorinput.tpl
+++ b/view/theme/frio/templates/field_colorinput.tpl
@@ -6,6 +6,8 @@
 		{{if $field.4}}<span class="required">{{$field.4}}</span>{{/if}}
 		<span class="input-group-addon"><i></i></span>
 	</div>
-	<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
+	{{if $field.3}}
+	<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+	{{/if}}
 	<div id="end_{{$field.0}}" class="field_end"></div>
 </div>
diff --git a/view/theme/frio/templates/field_custom.tpl b/view/theme/frio/templates/field_custom.tpl
index 20f529278..158073a64 100644
--- a/view/theme/frio/templates/field_custom.tpl
+++ b/view/theme/frio/templates/field_custom.tpl
@@ -2,5 +2,7 @@
 <div class="form-group field custom">
 	<label for="{{$field.0}}">{{$field.1}}</label>
 	{{$field.2}}
-	<span class="help-block" id="{{$field.0}}_tip">{{$field.3}}</span>
+	{{if $field.3}}
+	<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+	{{/if}}
 </div>
diff --git a/view/theme/frio/templates/field_fileinput.tpl b/view/theme/frio/templates/field_fileinput.tpl
index 721a6535f..c5f8ac86d 100644
--- a/view/theme/frio/templates/field_fileinput.tpl
+++ b/view/theme/frio/templates/field_fileinput.tpl
@@ -6,6 +6,8 @@
 		{{if $field.4}}<span class="required">{{$field.4}}</span>{{/if}}
 		<span class="input-group-addon image-select"><i class="fa fa-picture-o"></i></span>
 	</div>
-	<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
+	{{if $field.3}}
+	<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+	{{/if}}
 	<div id="end_{{$field.0}}" class="field_end"></div>
 </div>
diff --git a/view/theme/frio/templates/field_input.tpl b/view/theme/frio/templates/field_input.tpl
index bbd7535e5..62a7d72e8 100644
--- a/view/theme/frio/templates/field_input.tpl
+++ b/view/theme/frio/templates/field_input.tpl
@@ -2,6 +2,8 @@
 <div id="id_{{$field.0}}_wrapper" class="form-group field input">
 	<label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
 	<input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}"{{if $field.6 eq "email"}} type="email"{{elseif $field.6 eq "url"}} type="url"{{else}} type="text"{{/if}} value="{{$field.2|escape:'html'}}"{{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby="{{$field.0}}_tip">
-	<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
+	{{if $field.3}}
+	<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+	{{/if}}
 	<div class="clear"></div>
 </div>
diff --git a/view/theme/frio/templates/field_intcheckbox.tpl b/view/theme/frio/templates/field_intcheckbox.tpl
index 8863d14c4..f898c87fa 100644
--- a/view/theme/frio/templates/field_intcheckbox.tpl
+++ b/view/theme/frio/templates/field_intcheckbox.tpl
@@ -2,6 +2,8 @@
 	<div class="form-group field checkbox">
 		<input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.3|escape:'html'}}" {{if $field.2}}checked="checked"{{/if}} aria-checked="{{if $field.2}}true{{else}}false{{/if}}" aria-describedby="{{$field.0}}_tip">
 		<label for="id_{{$field.0}}">{{$field.1}}</label>
-		<span class="help-block" role="tooltip" id="{{$field.0}}_tip">{{$field.4}}</span>
+		{{if $field.4}}
+		<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.4}}</span>
+		{{/if}}
 	</div>
 	<div class="clear"></div>
diff --git a/view/theme/frio/templates/field_openid.tpl b/view/theme/frio/templates/field_openid.tpl
index 8081f9cf1..66f8c9e80 100644
--- a/view/theme/frio/templates/field_openid.tpl
+++ b/view/theme/frio/templates/field_openid.tpl
@@ -2,6 +2,8 @@
 <div id="id_{{$field.0}}_wrapper" class="form-group field input openid">
 	<label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}</label>
 	<input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2|escape:'html'}}" aria-describedby="{{$field.0}}_tip">
-	<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
+	{{if $field.3}}
+	<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+	{{/if}}
 	<div class="clear"></div>
 </div>
diff --git a/view/theme/frio/templates/field_password.tpl b/view/theme/frio/templates/field_password.tpl
index 31defaf33..7bef420a1 100644
--- a/view/theme/frio/templates/field_password.tpl
+++ b/view/theme/frio/templates/field_password.tpl
@@ -2,6 +2,8 @@
 <div id="id_{{$field.0}}_wrapper" class="form-group field input password">
 	<label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
 	<input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="password" value="{{$field.2|escape:'html'}}" {{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby="{{$field.0}}_tip">
-	<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
+	{{if $field.3}}
+	<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+	{{/if}}
 	<div class="clear"></div>
 </div>
diff --git a/view/theme/frio/templates/field_radio.tpl b/view/theme/frio/templates/field_radio.tpl
index 42c145e3a..725e1c96a 100644
--- a/view/theme/frio/templates/field_radio.tpl
+++ b/view/theme/frio/templates/field_radio.tpl
@@ -4,7 +4,9 @@
 			<input type="radio" name="{{$field.0}}" id="id_{{$field.0}}_{{$field.2}}" value="{{$field.2}}" {{if $field.4}}checked{{/if}} aria-checked="{{if $field.4}}true{{else}}false{{/if}}" aria-describedby="{{$field.0}}_{{$field.2}}_tip">
 			<label for="id_{{$field.0}}_{{$field.2}}">
 				{{$field.1}}
+				{{if $field.3}}
 				<span class="help-block" id="{{$field.0}}_{{$field.2}}_tip" role="tooltip">{{$field.3}}</span>
+				{{/if}}
 			</label>
 		</div>
-	</div>
\ No newline at end of file
+	</div>
diff --git a/view/theme/frio/templates/field_select.tpl b/view/theme/frio/templates/field_select.tpl
index 9c0315121..594b91002 100644
--- a/view/theme/frio/templates/field_select.tpl
+++ b/view/theme/frio/templates/field_select.tpl
@@ -4,5 +4,7 @@
 		<select name="{{$field.0}}" id="id_{{$field.0}}" class="form-control" aria-describedby="{{$field.0}}_tip">
 			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt|escape:'html'}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
 		</select>
-		<span class="help-block" id="{{$field.0}}_tip">{{$field.3}}</span>
-</div>
\ No newline at end of file
+		{{if $field.3}}
+		<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+		{{/if}}
+</div>
diff --git a/view/theme/frio/templates/field_select_raw.tpl b/view/theme/frio/templates/field_select_raw.tpl
index d4f476860..52b63079c 100644
--- a/view/theme/frio/templates/field_select_raw.tpl
+++ b/view/theme/frio/templates/field_select_raw.tpl
@@ -4,5 +4,7 @@
 	<select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" aria-describedby="{{$field.0}}_tip">
 		{{$field.4}}
 	</select>
-	<span class="help-block" id="{{$field.0}}_tip">{{$field.3}}</span>
-</div>
\ No newline at end of file
+	{{if $field.3}}
+	<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+	{{/if}}
+</div>
diff --git a/view/theme/frio/templates/field_textarea.tpl b/view/theme/frio/templates/field_textarea.tpl
index 8ef56babb..1aea484de 100644
--- a/view/theme/frio/templates/field_textarea.tpl
+++ b/view/theme/frio/templates/field_textarea.tpl
@@ -2,6 +2,8 @@
 	<div class="form-group field textarea">
 		<label for="id_{{$field.0}}">{{$field.1}}</label>
 		<textarea class="form-control text-autosize" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.4}}{{$field.4}}{{/if}} aria-describedby="{{$field.0}}_tip">{{$field.2}}</textarea>
-		<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
+		{{if $field.3}}
+		<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+		{{/if}}
 		<div class="clear"></div>
 	</div>
diff --git a/view/theme/frio/templates/field_themeselect.tpl b/view/theme/frio/templates/field_themeselect.tpl
index 3b2cb780c..fc1f7243a 100644
--- a/view/theme/frio/templates/field_themeselect.tpl
+++ b/view/theme/frio/templates/field_themeselect.tpl
@@ -5,6 +5,8 @@
 	<select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.5=="preview"}}onchange="previewTheme(this);"{{/if}} aria-describedby="{{$field.0}}_tip" >
 		{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
 	</select>
+	{{if $field.3}}
 	<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+	{{/if}}
 	{{if $field.5=="preview"}}<div id="theme-preview"></div>{{/if}}
-</div>
\ No newline at end of file
+</div>
diff --git a/view/theme/frio/templates/field_yesno.tpl b/view/theme/frio/templates/field_yesno.tpl
index 85096c70e..47649fe67 100644
--- a/view/theme/frio/templates/field_yesno.tpl
+++ b/view/theme/frio/templates/field_yesno.tpl
@@ -14,6 +14,8 @@
 				<span class="toggle-handle btn btn-default btn-xs"></span>
 			</div>
 		</div>
+		{{if $field.3}}
 		<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+		{{/if}}
 	</div>
 	<div class="clear"></div>
diff --git a/view/theme/frio/templates/login.tpl b/view/theme/frio/templates/login.tpl
index aaa42d24b..57bb86c15 100644
--- a/view/theme/frio/templates/login.tpl
+++ b/view/theme/frio/templates/login.tpl
@@ -8,6 +8,9 @@
 		<div id="login_standard">
 			{{include file="field_input.tpl" field=$lname}}
 			{{include file="field_password.tpl" field=$lpassword}}
+			<div id="login-lost-password-link">
+				<a href="lostpass" title="{{$lostpass|escape:'html'}}" id="lost-password-link" >{{$lostlink}}</a>
+			</div>
 		</div>
 
 		{{if $openid}}
@@ -19,10 +22,7 @@
 		{{include file="field_checkbox.tpl" field=$lremember}}
 
 		<div id="login-submit-wrapper">
-			<a href="lostpass" title="{{$lostpass|escape:'html'}}" id="lost-password-link">{{$lostlink}}</a>
-
 			<div class="pull-right" >
-				{{if $register}}<a href="register" title="{{$register.title|escape:'html'}}" id="register-link" class="btn btn-default">{{$register.desc}}</a>{{/if}}
 				<button type="submit" name="submit" id="login-submit-button" class="btn btn-primary" value="{{$login|escape:'html'}}">{{$login|escape:'html'}}</button>
 			</div>
 		</div>
@@ -32,7 +32,15 @@
 			<input type="hidden" name="{{$k}}" value="{{$v|escape:'html'}}" />
 		{{/foreach}}
 
+		<div id="login-end"></div>
 	</div>
 </form>
 
+{{if $register}}
+<div id="login-extra-links">
+	<h3 id="login-head" class="sr-only">{{$register.title|escape:'html'}}</h3>
+	<a href="register" title="{{$register.title|escape:'html'}}" id="register-link" class="btn btn-default">{{$register.desc}}</a>
+</div>
+{{/if}}
+
 <script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>
diff --git a/view/theme/vier/mobile.css b/view/theme/vier/mobile.css
index 66721a1b8..b528ca4bd 100644
--- a/view/theme/vier/mobile.css
+++ b/view/theme/vier/mobile.css
@@ -91,6 +91,13 @@ nav ul {
     width: 100% !important; height: 110px !important;
   }
 
+  #login-extra-links, #login-form {
+    /* width: 341px; */
+    width: 100%;
+  }
+  #id_remember_label {
+    width: unset;
+  }
 }
 
 @media screen and (max-width: 480px) {
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index ba10b1602..288ede31d 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -2422,10 +2422,60 @@ aside #div_id_remember label {
  float:  inherit;
 }
 
+#login-group {
+  overflow: hidden;
+}
+
+#login-head {
+  position: unset;
+  width: unset;
+  height: unset;
+  margin-bottom: 10px;
+}
+
+div #wrapper_username {
+  padding: 0px;
+}
+
+div #wrapper_password {
+  padding: 0px;
+  margin-bottom: 0px;
+}
+
+#div_id_remember {
+  float: left;
+  width: unset;
+}
+
+#remember_tip {
+  display: none;
+}
+
+#login-submit-wrapper {
+  float: right;
+}
+
+#login-form {
+  margin-top: 20px;
+}
+
+#login-extra-links, #login-form {
+  /* width: 341px; */
+  width: 341px;
+  clear: both;
+  border-top: 3px solid white;
+  padding-top: 20px;
+}
+
 aside div #login-submit-button {
   margin-left:0px;
 }
 
+#login-lost-password-link {
+  margin-bottom: 10px;
+  float: right;
+}
+
 aside #register-link, aside #lost-password-link {
   display: block;
 }