Work on a new Login form
fix merge probs Patrick