Removed echo from login and re-added welcome