Index: app/views/account/login.html.erb
===================================================================
--- app/views/account/login.html.erb	(Revision 17939)
+++ app/views/account/login.html.erb	(Arbeitskopie)
@@ -4,20 +4,16 @@
   <%= form_tag(signin_path, onsubmit: 'return keepAnchorOnSignIn(this);') do %>
   <%= back_url_hidden_field_tag %>
   
-  <label for="username"><%=l(:field_login)%></label>
-  <%= text_field_tag 'username', params[:username], :tabindex => '1' %>
+  <%= text_field_tag 'username', params[:username], :tabindex => '1', :placeholder => l(:field_login) %>
+  <%= password_field_tag 'password', nil, :tabindex => '2', :placeholder => l(:field_password) %>
+
   
-  <label for="password">
-    <%=l(:field_password)%>
-    <%= link_to l(:label_password_lost), lost_password_path, :class => "lost_password" if Setting.lost_password? %>
-  </label>
-  <%= password_field_tag 'password', nil, :tabindex => '2' %>
-  
   <% if Setting.openid? %>
-    <label for="openid_url"><%=l(:field_identity_url)%></label>
-    <%= text_field_tag "openid_url", nil, :tabindex => '3' %>
+    <%= text_field_tag "openid_url", nil, :tabindex => '3', :placeholder => l(:field_identity_url) %>
   <% end %>
   
+  <%= link_to l(:label_password_lost), lost_password_path, :class => "lost_password" if Setting.lost_password? %>
+
   <% if Setting.autologin? %>
     <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label>
   <% end %>
Index: public/stylesheets/application.css
===================================================================
--- public/stylesheets/application.css	(Revision 17939)
+++ public/stylesheets/application.css	(Arbeitskopie)
@@ -108,7 +108,7 @@
 #login-form input[type=text], #login-form input[type=password] {border:1px solid #ccc; border-radius:3px; margin-bottom:15px; padding:7px; display:block; width:100%; box-sizing: border-box;}
 #login-form label {font-weight:bold;}
 #login-form label[for=autologin] {font-weight:normal;}
-#login-form a.lost_password {float:right; font-weight:normal;}
+#login-form a.lost_password {float:right; font-weight:normal; margin-bottom: 15px;}
 #login-form input#openid_url {background:#fff url(../images/openid-bg.gif) no-repeat 4px 50%; padding-left:24px !important;}
 #login-form input#login-submit {margin-top:15px; padding:7px; display:block; width:100%; box-sizing: border-box;}