Small changes

Added curly braces to all ifs to conform for the code audit.
Fixed the Null Pointer resulting from deleting an account then pressing
back (I think).
Merge branch 'master' of https://github.com/Matches-on-the-Moon/Find-my-stuff