Login form page modifications
Merge fix