Fixed some stuff in AutenticatorActivity
Somethings refactored