Login Form improvement
#Issue18