Add ENTER to validate message and Login
Modify TODO