refactored login-form templates