Some Improvements for StartUp Login Handler