v0.6.9.5 commit before final login changes - backup