Fixed correct_user being checked on a new and create address/user