Couple of changes for OpenShift and a fix in the login view