X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9dd5dabf869e76cc00698e12b284400e570098c0..48eb8eb3690851f7f26afc68e1524341fcb6c187:/app/views/user/login.html.erb

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index 3c9557ae0..3d28a770a 100644
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -33,7 +33,7 @@
       </fieldset>
 
       <fieldset>
-        <%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %>
+        <%= check_box_tag "remember_me", "yes", params[:remember_me] == "yes", :tabindex => 3 %>
         <label for="remember_me" class="standard-label">
           <%= t 'user.login.remember' %>
         </label>
@@ -55,6 +55,9 @@
           <% if defined?(WINDOWSLIVE_AUTH_ID) -%>
           <li><%= auth_button "windowslive", "windowslive" %></li>
           <% end -%>
+          <% if defined?(GITHUB_AUTH_ID) -%>
+          <li><%= auth_button "github", "github" %></li>
+          <% end -%>
           <li><%= auth_button "yahoo", "openid", :openid_url => "yahoo.com" %></li>
           <li><%= auth_button "wordpress", "openid", :openid_url => "wordpress.com" %></li>
           <li><%= auth_button "aol", "openid", :openid_url => "aol.com" %></li>