Fixed a bug in resetting facility_user session var; cleaned up messages and redirects; Addressed first part of #393