diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html
index 06de4c744..cb20ffb75 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html
@@ -23,7 +23,7 @@
 	</div>
 	<div class="control-group" data-bind="css: {'error': passwordError}">
 		<label data-i18n="GLOBAL/PASSWORD"></label>
-		<input type="password" class="inputPassword input-xlarge" autocomplete="new-password" autocorrect="off" autocapitalize="off" spellcheck="false"
+		<input type="password" class="input-xlarge" autocomplete="new-password" autocorrect="off" autocapitalize="off" spellcheck="false"
 			data-bind="value: password, onEnter: addAccountCommand" />
 	</div>
 </form>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html
index 04ad488a1..0ccf40e06 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html
@@ -8,23 +8,22 @@
 			<div class="span4">
 				<div class="control-group">
 					<label data-i18n="GLOBAL/FROM"></label>
-					<input type="text" class="uiInput inputFrom"
-						autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+					<input type="text" autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
 						data-bind="value: from, onEnter: searchCommand, onEsc: cancelCommand" />
 				</div>
 				<div class="control-group">
 					<label data-i18n="GLOBAL/TO"></label>
-					<input type="text" class="uiInput inputFrom" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+					<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
 						data-bind="value: to, onEnter: searchCommand, onEsc: cancelCommand" />
 				</div>
 				<div class="control-group">
 					<label data-i18n="GLOBAL/SUBJECT"></label>
-					<input type="text" class="uiInput inputFrom" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+					<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
 						data-bind="value: subject, onEnter: searchCommand, onEsc: cancelCommand" />
 				</div>
 				<div class="control-group">
 					<label data-i18n="SEARCH/LABEL_ADV_TEXT"></label>
-					<input type="text" class="uiInput inputFrom" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+					<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
 						data-bind="value: text, onEnter: searchCommand, onEsc: cancelCommand" />
 				</div>
 			</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html
index 70050c722..b9b0ea1d4 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html
@@ -11,7 +11,7 @@
 		</div>
 		<div class="control-group">
 			<label data-i18n="GLOBAL/NAME"></label>
-			<input type="text" class="uiInput inputName"
+			<input type="text"
 				autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
 				data-bind="textInput: folderName, onEnter: createFolderCommand" />
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
index 5e2fff50a..7ee1761f3 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
@@ -22,7 +22,7 @@
 		</div>
 		<div class="control-group">
 			<label data-i18n="GLOBAL/NAME"></label>
-			<input type="text" class="inputName input-xlarge"
+			<input type="text" class="input-xlarge"
 				autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
 				data-bind="value: name, onEnter: addOrEditIdentityCommand" />
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html
index b5151d670..f196b7dda 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html
@@ -2,34 +2,34 @@
 	<a href="#" class="close" data-bind="command: cancelCommand">×</a>
 	<h3 data-i18n="POPUPS_GENERATE_OPEN_PGP_KEYS/TITLE_GENERATE_OPEN_PGP_KEYS"></h3>
 </header>
-<div class="modal-body form-horizontal">
+<form class="modal-body form-horizontal" autocomplete="off">
 	<div class="alert" data-bind="visible: '' !== submitError()">
 		<a href="#" class="close" data-bind="click: function () { submitError('') }">×</a>
 		<span data-bind="text: submitError"></span>
 	</div>
 	<div class="control-group" data-bind="css: {'error': emailError}">
 		<label data-i18n="GLOBAL/EMAIL"></label>
-		<input type="email" class="input-large"
+		<input type="email" class="input-xlarge"
 			autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
 			data-bind="value: email" />
 	</div>
 	<div class="control-group">
 		<label data-i18n="GLOBAL/NAME"></label>
-		<input type="text" class="inputName input-large"
+		<input type="text" class="input-xlarge"
 			autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
 			data-bind="value: name" />
 	</div>
 	<div class="control-group">
 		<label data-i18n="GLOBAL/PASSWORD"></label>
-		<input type="password" class="inputPassword input-large"
-			autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
+		<input type="password" class="input-xlarge"
+			autocomplete="new-password" autocorrect="off" autocapitalize="off" spellcheck="false"
 			data-bind="value: password" />
 	</div>
 	<div class="control-group">
 		<label data-i18n="POPUPS_GENERATE_OPEN_PGP_KEYS/LABEL_KEY_BIT_LENGTH"></label>
 		<select data-bind="value: keyBitLength, options: [2048, 4096]"></select>
 	</div>
-</div>
+</form>
 <footer>
 	<a class="btn buttonHenerateOpenPgpKey" data-bind="command: generateOpenPgpKeyCommand">
 		<i class="fontastic" data-bind="css: {'icon-spinner': submitRequest()}">🔑</i>
diff --git a/vendors/bootstrap/less/forms.less b/vendors/bootstrap/less/forms.less
index 892404993..6d35db9b3 100644
--- a/vendors/bootstrap/less/forms.less
+++ b/vendors/bootstrap/less/forms.less
@@ -103,7 +103,6 @@ input[type="checkbox"]:focus {
 // -----------
 
 // General classes for quick sizes
-.input-large      { width: 210px; }
 .input-xlarge     { width: 270px; }
 .input-xxlarge    { width: 530px; }
 
diff --git a/vendors/bootstrap/less/type.less b/vendors/bootstrap/less/type.less
index a5c60b986..896678d44 100644
--- a/vendors/bootstrap/less/type.less
+++ b/vendors/bootstrap/less/type.less
@@ -35,16 +35,17 @@ cite {
 // -------------------------
 
 h1, h2, h3, h4, h5, h6 {
+  line-height: 40px;
   margin: (@baseLineHeight / 2) 0;
-  line-height: 1;
   text-rendering: optimizelegibility; // Fix the character spacing for headings
 }
-h1 { font-size: 36px; line-height: 40px; }
-h2 { font-size: 30px; line-height: 40px; }
-h3 { font-size: 24px; line-height: 40px; }
-h4 { font-size: 18px; line-height: 20px; }
-h5 { font-size: 14px; line-height: 20px; }
-h6 { font-size: 12px; line-height: 20px; }
+h1 { font-size: 36px; }
+h2 { font-size: 30px; }
+h3 { font-size: 24px; }
+h4 { font-size: 18px; }
+h5 { font-size: 14px; }
+h6 { font-size: 12px; }
+h4, h5, h6 { line-height: 20px; }
 
 
 // Lists