revert login
Merge branch '48'