Refactors for new authentication routes

@jamesongamble - please remove this method.