Incorporate @jhart-r7's better fix
Updates to better OWA fix
Move userpass emptiness checking into setup