Adding keys to login flow. Fixes #49