Slightly different approach to login
Merge branch 'bugs/fix-twitter-handle-on-login-44805681' into development