change format to mimic sign-in page
Merge branch 'master' of github.com:blee42/4w