Removed unnecessary setting entries and added second user