Revert "Revert "Working on Logon Page""

This reverts commit c82fe68e5ec07471453b0d9dd4a3a0c4e2e2f367.