improving the Server Login code.