retain login info fix
Merge branch 'feature-login' into development