Remove explict pkey declaration in migration
Resurect and simplify _login_action