Changes to login structure

We now have a successful login setup