Added login handeling
merge done