Added validity checks for when loading users