Login working
dry and fixing messages