Autocomplete Rule - Home State v. Work State

I am working on building a validation rule in employee's self-service whereas if they are changing their home address and their residential state is different from their work state, they would receive an error message.

I had created the rule below, but it only works when an employee is adding a new address. How can I make this effective when they are editing their current address? Also, if I wanted this rule to alert the employee only and still have them submit the change, how can I make that happen?

I understand Redwood will remove the autocomplete rule function, but I would like to create this before we transition to test as well (whether it'll come over or need to recreate it with the new tool).