Added eventhandler portion back for first log on