diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 3d526fb..f9bc2c1 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,8 +1,8 @@
 <h2>Sign in</h2>
 
 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-  <div><%= f.label :username %><br />
-  <%= f.text_field :username, :autofocus => true %></div>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, :autofocus => true %></div>
 
   <div><%= f.label :password %><br />
   <%= f.password_field :password %></div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 3c56e94..9711eda 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -54,9 +54,6 @@
               <% else %>
               <li><%= link_to "Sign in", new_user_session_path,
                         :method => :get %></li>
-              <li><%= link_to "Register", new_user_registration_path,
-                        :method => :get %></li>
-
               <% end %>
             </ul>
           </div><!--/.nav-collapse -->