Minor tweaks to allow the return key to be pressed and start login