diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index b652794..e7a93f8 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -2,9 +2,9 @@
 
 <% form_for :session, :url => session_path do |form| %>
   <fieldset class="inputs">
-    <%= form.string :email %>
+    <%= form.string   :email %>
     <%= form.password :password %>
-    <%= form.password :password_confirmation %>
+    <%= form.boolean  :remember_me %>
   </fieldset>
   <fieldset class="buttons">
     <%= form.submit "Sign in", :disable_with => "Please wait..." %>
diff --git a/features/sign_up.feature b/features/sign_up.feature
index 27492d9..dd4269c 100644
--- a/features/sign_up.feature
+++ b/features/sign_up.feature
@@ -7,7 +7,7 @@ Feature: Sign up
       When I go to the sign up page
       And I fill in "Email" with "invalidemail"
       And I fill in "Password" with "password"
-      And I fill in "Confirm password" with ""
+      And I fill in "Password confirmation" with ""
       And I press "Sign Up"
       Then I should see error messages
 
@@ -15,7 +15,7 @@ Feature: Sign up
       When I go to the sign up page
       And I fill in "Email" with "email@person.com"
       And I fill in "Password" with "password"
-      And I fill in "Confirm password" with "password"
+      And I fill in "Password confirmation" with "password"
       And I press "Sign Up"
       Then I should see "instructions for confirming"
       And a confirmation message should be sent to "email@person.com"
--
libgit2 0.21.2