Account login fix round 1
Versioning