Address change fix for single user