Fix user login
Merge branch 'fix/login-post' into staging/master
Merge branch 'staging/master'