diff --git a/templates/user/settings/delete.tmpl b/templates/user/settings/delete.tmpl
index 933f383a47d..77ddda837bb 100644
--- a/templates/user/settings/delete.tmpl
+++ b/templates/user/settings/delete.tmpl
@@ -13,14 +13,14 @@
 			<form class="ui form" id="delete-form" action="{{.Link}}" method="post">
 				{{.CsrfTokenHtml}}
 				<input class="fake" type="password">
-				<div class="inline required field {{if .Err_Password}}error{{end}}">
+				<div class="required field {{if .Err_Password}}error{{end}}">
 					<label for="password">{{.i18n.Tr "password"}}</label>
 					<input id="password" name="password" type="password" autofocus required>
 				</div>
-				<div class="ui red button delete-button" data-type="form" data-form="#delete-form">
-					{{.i18n.Tr "settings.confirm_delete_account"}}
-				</div>
-				<div>
+				<div class="field">
+					<div class="ui red button delete-button" data-type="form" data-form="#delete-form">
+						{{.i18n.Tr "settings.confirm_delete_account"}}
+					</div>
 					<a href="{{AppSubUrl}}/user/forgot_password?email={{.Email}}">{{.i18n.Tr "auth.forgot_password"}}</a>
 				</div>
 			</form>
diff --git a/templates/user/settings/openid.tmpl b/templates/user/settings/openid.tmpl
index 1a73bf5545f..6ae4a8dee80 100644
--- a/templates/user/settings/openid.tmpl
+++ b/templates/user/settings/openid.tmpl
@@ -48,7 +48,7 @@
 				{{.CsrfTokenHtml}}
 				<div class="required field {{if .Err_OpenID}}error{{end}}">
 					<label for="openid">{{.i18n.Tr "settings.add_new_openid"}}</label>
-					<input id="openid" name="openid" type="openid" autofocus required>
+					<input id="openid" name="openid" type="text" autofocus required>
 				</div>
 				<button class="ui green button">
 					{{.i18n.Tr "settings.add_openid"}}