Change Login so login data will change from sha1 to hash
Merge login with master