UI (Enterprise login): Change Enterprise UI to be less error prone

Closes #113