diff --git a/app/views/passwords/edit.html.erb b/app/views/passwords/edit.html.erb
index 3b91afa..35e77fa 100644
--- a/app/views/passwords/edit.html.erb
+++ b/app/views/passwords/edit.html.erb
@@ -4,16 +4,16 @@
   Your password has been reset. Choose a new password below.
 </p>
 
-<% form_for(:user,
+<% semantic_form_for(:user,
             :url  => user_password_path(@user, :token => @user.token),
             :html => { :method => :put }) do |form| %>
-  <fieldset class="inputs">
-    <%= form.error_messages %>
-    <%= form.password :password %>
-    <%= form.password :password_confirmation %>
-  </fieldset>
-  <fieldset class="buttons">
-    <%= form.submit "Save this password", :disable_with => "Please wait..." %>
-  </fieldset>
+  <%= form.error_messages %>
+  <% form.inputs do -%>
+    <%= form.input :password, :as => :password %>
+    <%= form.input :password_confirmation, :as => :password %>
+  <% end -%>
+  <% form.buttons do -%>
+    <%= form.commit_button "Save this password" %>
+  <% end -%>
 <% end %>
 
diff --git a/app/views/passwords/new.html.erb b/app/views/passwords/new.html.erb
index f157cd9..60e2371 100644
--- a/app/views/passwords/new.html.erb
+++ b/app/views/passwords/new.html.erb
@@ -4,12 +4,12 @@
   We will email you a link to reset your password.
 </p>
 
-<% form_for :password, :url => passwords_path do |form| %>
-  <fieldset class="inputs">
-    <%= form.string :email %>
-  </fieldset>
-  <fieldset class="buttons">
-    <%= form.submit "Reset password", :disable_with => "Please wait..." %>
-  </fieldset>
-<% end %>
+<% semantic_form_for :password, :url => passwords_path do |form| -%>
+  <% form.inputs do -%>
+    <%= form.input :email %>
+  <% end -%>
+  <% form.buttons do -%>
+    <%= form.commit_button "Reset password" %>
+  <% end -%>
+<% end -%>
 
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index e7a93f8..10c3343 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -1,14 +1,14 @@
 <h2>Sign in</h2>
 
-<% form_for :session, :url => session_path do |form| %>
-  <fieldset class="inputs">
-    <%= form.string   :email %>
-    <%= form.password :password %>
-    <%= form.boolean  :remember_me %>
-  </fieldset>
-  <fieldset class="buttons">
-    <%= form.submit "Sign in", :disable_with => "Please wait..." %>
-  </fieldset>
+<% semantic_form_for :session, :url => session_path do |form| %>
+  <% form.inputs do %>
+    <%= form.input :email %>
+    <%= form.input :password, :as => :password %>
+    <%= form.input :remember_me, :as => :boolean %>
+  <% end %>
+  <% form.buttons do %>
+    <%= form.commit_button "Sign In" %>
+  <% end %>
 <% end %>
 
 <ul>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 69b1aa1..b85d767 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,10 +1,8 @@
 <h2>Sign up</h2>
 
-<% form_for @user do |form| %>
-  <%= form.error_messages %>
-  <%= render :partial => '/users/inputs', :locals => { :form => form } %>
-  <fieldset class="buttons">
-    <%= form.submit 'Sign up', :disable_with => 'Please wait...' %>
-  </fieldset>
+<% form.inputs do %>
+  <%= form.input :email %>
+  <%= form.input :password, :as => :password %>
+  <%= form.input :password_confirmation, :as => :password %>
 <% end %>
 
--
libgit2 0.21.2