Fixed a few issues with the login and account refrence