Redirect new users to the account page and dont use next on login

opentech/apply/users/templates/users/login.html

@@ -13,7 +13,7 @@
     </form>
 
     <div class="wrapper wrapper--inner-space-large">
-      <a class="link link--button link--button-long-text" href="{% url "social:begin" "google-oauth2" %}?next={% url "users:account" %}">Log in with your OTF email</a>
+      <a class="link link--button link--button-long-text" href="{% url "social:begin" "google-oauth2" %}">Log in with your OTF email</a>
     </div>
   </div>
 {% endblock %}

opentech/settings/base.py

@@ -318,7 +318,7 @@ SOCIAL_AUTH_GOOGLE_OAUTH2_KEY = ''
 SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = ''
 
 SOCIAL_AUTH_LOGIN_ERROR_URL = 'users:login'
-SOCIAL_AUTH_NEW_ASSOCIATION_REDIRECT_URL = 'users:dashboard'
+SOCIAL_AUTH_NEW_ASSOCIATION_REDIRECT_URL = 'users:account'
 
 # For pipelines, see http://python-social-auth.readthedocs.io/en/latest/pipeline.html?highlight=pipelines#authentication-pipeline
 # Create / associate accounts (including by email)