diff --git a/app/views/layouts/login.haml b/app/views/layouts/login.haml
index 787ece3c..64d87195 100644
--- a/app/views/layouts/login.haml
+++ b/app/views/layouts/login.haml
@@ -4,7 +4,7 @@
     %meta{"http-equiv" => "content-type", :content => "text/html;charset=UTF-8"}
     %title= "FoodSoft - " + (yield(:title) or controller.controller_name)
     = stylesheet_link_tag 'main', 'rails_messages', 'nav', :cache => "all_cached"
-    = javascript_include_tag 'prototype', 'effects', 'controls', 'application', 'ordering', :cache => "all_cached"
+    = javascript_include_tag 'jquery.min'
     = yield(:head)
   %body
     #login
diff --git a/app/views/sessions/new.html.haml b/app/views/sessions/new.html.haml
index 597d991f..e933c4fe 100644
--- a/app/views/sessions/new.html.haml
+++ b/app/views/sessions/new.html.haml
@@ -1,20 +1,18 @@
 - content_for :head do
   :javascript
-    document.observe("dom:loaded", function() {
-      // initially hide javascript warn message, when javascript is available
-      $('javascript-warn').hide(); $('login-form').show();
-
-      $('login_user').focus();
+    $(function() {
+      $('#nick').focus();
     });
 
 - title "FoodSoft login"
 
-#javascript-warn.error(style="font-size:1.5em")
-  %b Achtung, Cookies und Javascript müssen aktiviert sein!
-  = link_to "NoScript", "http://noscript.net/"
-  bitte abschalten.
+%noscript
+  #javascript-warn.error(style="font-size:1.5em")
+    Achtung, Cookies und Javascript müssen aktiviert sein!
+    = link_to "NoScript", "http://noscript.net/"
+    bitte abschalten.
 
-#login-form.edit_form(style="width:25em;display:none")
+#login-form.edit_form(style="width:25em")
   = form_tag sessions_path do
     %p
       %label{:for => 'user'} Benutzerin