Removed server calls
Extended password support :P