Login error fixes
Merge branch 'sprint-3' of github.com:rumblefish/fmpro into sprint-3