Fix empty string enter on username and keyboard #66
Fixed merge conflict