Login page and form adjusts

- Fix issue #1286 
- Fix issue #1285
- Small adjusts