Completing login and key management (part 1.1)