Melissa/login hotfix

Also, this is a bug from last time, you don't want to be creating objects whenever a button is pressed