couple changes to email and main windows for password hash
change to email and main window for password hash
fixed conflicts