Minor improvements to login
Added Enumertaions for unitypes