Login improved and logout option