some fixes for login command parsing