Alter user login form
Alter user login form
Merge branch 'development'