Sorting the login screen to allow for DB errors
Merge branch 'master' of https://github.com/madjake45/dev