diff --git a/app/controllers/public/account_controller.rb b/app/controllers/public/account_controller.rb
index 583f0e0..2d4dd2c 100644
--- a/app/controllers/public/account_controller.rb
+++ b/app/controllers/public/account_controller.rb
@@ -15,7 +15,7 @@ class AccountController < PublicController
   def login
     @user = User.new
     return unless request.post?
-    self.current_user = User.authenticate(params[:login], params[:password])
+    self.current_user = User.authenticate(params[:user][:login], params[:user][:password])
     if logged_in?
       if params[:remember_me] == "1"
         self.current_user.remember_me
diff --git a/app/views/account/login.rhtml b/app/views/account/login.rhtml
index b5dff23..702651d 100644
--- a/app/views/account/login.rhtml
+++ b/app/views/account/login.rhtml
@@ -1,20 +1,14 @@
 <h1><%= _('Login') %></h1>
 
-<% form_tag do -%>
-  <p class='formfield text_field'><label class='formlabel' for="login"> <%= _('Username') %> </label><br/>
-<%= text_field_tag 'login' %></p>
+<% labelled_form_for :user, @user do |f| %>
 
-<p class='formfield text_field'><label class='formlabel' for="password"> <%= _('Password') %></label><br/>
-<%= password_field_tag 'password' %></p>
+<%= f.text_field :login %>
 
-<!-- Uncomment this if you want this functionality
-<p><label for="remember_me">Remember me:</label>
-<%= check_box_tag 'remember_me' %></p>
--->
+<%= f.password_field :password %>
 
 <p class='submitline'><%= submit_tag 'Log in', {:class => 'submit'} %></p>
-<% end -%>
 
+<% end %>
 
 <p>
 <%= link_to _("I forgot my password!"), :action => 'forgot_password' %>
diff --git a/public/designs/templates/default/stylesheets/forms.css b/public/designs/templates/default/stylesheets/forms.css
index 9a74c37..560db82 100644
--- a/public/designs/templates/default/stylesheets/forms.css
+++ b/public/designs/templates/default/stylesheets/forms.css
@@ -16,9 +16,14 @@
   border: 1px solid #999;
   border-top: none;
   border-left: none;
-  padding: 3px;
   color: #585858;
 }
+.formfield input {
+  text-indent: 5px;
+}
+.formfield textarea {
+  padding: 0px 5px;
+}
 
 .submitline {
   text-align: center;
diff --git a/script/find_here b/script/find_here
new file mode 100755
index 0000000..02cff88
--- /dev/null
+++ b/script/find_here
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [ "$1" = "" ]; then
+  echo "
+  Usage:
+  $0 <text to serach> [<file extension>]
+  "
+  exit 1
+fi
+
+if [ "$2" = "" ]; then
+  ext='.*'
+else
+  ext="$2"
+fi
+
+grep -r --ignore-case "$1" . | grep --ignore-case "\.$ext:"
--
libgit2 0.21.2