Added fixes to allow only entered users into the system.