Fixing issues with authentication

Rabbit likes to do a lot of stuff its self