Move logic around so that if a user has settings in the db but checks a different location, it applies (h/t Phibs)