Added some login functionallity
Fixed a conflict.