diff --git a/dss/settings.py b/dss/settings.py
index 3f6873e..f9cbca0 100644
--- a/dss/settings.py
+++ b/dss/settings.py
@@ -202,8 +202,8 @@ SOCIALACCOUNT_PROVIDERS = {
     }
 }
 ACCOUNT_EMAIL_REQUIRED = True
-SOCIALACCOUNT_QUERY_EMAIL = True
-EMAIL_CONFIRMATION_DAYS = 7
+SOCIALACCOUNT_QUERY_EMAIL = False
+#EMAIL_CONFIRMATION_DAYS = 7
 SOCIALACCOUNT_AUTO_SIGNUP = True
 AVATAR_STORAGE_DIR = MEDIA_ROOT + '/avatars/'
 
diff --git a/templates/views/HeaderView.html b/templates/views/HeaderView.html
index dd2bb03..ff81596 100644
--- a/templates/views/HeaderView.html
+++ b/templates/views/HeaderView.html
@@ -15,7 +15,7 @@
                     <li><a class="no-click" href="{% url account_logout %}" id="logout">Logout&nbsp;<i class="icon-eject icon-black"></i></a>
                     </li>
                     {% else %}
-                    <li><a href="{% url account_login %}" id="login">Login/Signup&nbsp;<i
+                    <li><a href="{% url account_login %}" class="no-click" id="login">Login/Signup&nbsp;<i
                             class="icon-music icon-black"></i></a></li>
                     {% endif %}
                 </ul>