fixed improper merge of form structure changes, whoops
merge in updates to login-spinner branch