Fixed password isses

also fixed white space alighnment