diff --git a/src/IDF/templates/idf/login_form.html b/src/IDF/templates/idf/login_form.html
index 624d613..9377d45 100644
--- a/src/IDF/templates/idf/login_form.html
+++ b/src/IDF/templates/idf/login_form.html
@@ -1,18 +1,22 @@
 {extends "idf/base-simple.html"}
-{block docclass}yui-t1{/block}
+{block docclass}yui-t2{/block}
 {block body}
 <form method="post" action="{url 'IDF_Views::login'}">
 <input type="hidden" name="_redirect_after" value="{$_redirect_after}" />
 {if $error}
 <p class="px-message-error">{$error}</p>
 {/if}
-<h3>{trans 'What is your login?'}</h3>
-<p><label for="id_login">{trans 'My login is'}</label> <input type="text" name="login" id="id_login" value="{$login}" /></p>
-
-<h3>{trans 'Do you have a password?'}</h3>
-<p><input name="action" id="action-new-user" value="new-user" type="radio" /> <label for="action-new-user">{trans 'No, I am a new here.'}</label></p>
-
-<p><input name="action" id="action-login" value="login" type="radio" checked="checked" /> <label for="action-login">{trans 'Yes'}</label>, <label for="id_password">{trans 'my password is'}</label> <input type="password" name="password" id="id_password" /></p>
+<h3>{trans 'What is your account information?'}</h3>
+<table class="form" summary="">
+<tr>
+<th class="a-r"><strong>{trans 'My login is'}</strong></th>
+<td class="a-l"><input type="text" name="login" id="id_login" value="{$login}" /></th>
+</tr>
+<tr>
+<th class="a-r"><strong>{trans 'My password is'}</strong></th>
+<td class="a-l"><input type="password" name="password" id="id_password" /></th>
+</tr>
+</table>
 
 <p><input type="submit" value="{trans 'Sign in'}" />
 | <a href="{url 'IDF_Views::passwordRecoveryAsk'}">{trans 'I lost my password!'}</a>
@@ -22,3 +26,10 @@
 document.getElementById('id_login').focus()
 </script>
 {/block}
+{block context}
+<div class="issue-submit-info">
+<h3>{trans 'Welcome.'}</h3>
+<p>{trans 'If you don\'t have an account yet, you can create one'} <a href="{url 'IDF_Views::register', array()}">{trans 'here'}</a></p>
+<p>{trans 'It takes less than a minute to create your account'}</p>
+</div>
+{/block}