Fix for first start up and implement login