diff --git a/view/templates/login.tpl b/view/templates/login.tpl
index caa2e74a4..e1e8c5f3a 100644
--- a/view/templates/login.tpl
+++ b/view/templates/login.tpl
@@ -1,25 +1,27 @@
 
 
-<form action="{{$dest_url}}" method="post" >
-<fieldset>
+<form id="login-form" action="{{$dest_url}}" role="form" method="post" >
+<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>
+
 	<div id="login_standard">
 	{{include file="field_input.tpl" field=$lname}}
 	{{include file="field_password.tpl" field=$lpassword}}
 	</div>
 	
 	{{if $openid}}
-			<div id="login_openid">
-			{{include file="field_openid.tpl" field=$lopenid}}
-			</div>
+		<div id="login_openid">
+		{{include file="field_openid.tpl" field=$lopenid}}
+		</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>
+		<a href="lostpass" title="{{$lostpass|escape:'html'}}" id="lost-password-link" >{{$lostlink}}</a>
 	</div>
 	
 	<div id="login-submit-wrapper" >
@@ -30,7 +32,7 @@
 		<input type="hidden" name="{{$k}}" value="{{$v|escape:'html'}}" />
 	{{/foreach}}
 	
-</fieldset>
+</div>
 </form>