#920 Fix login interface issues