Allow declarative pattern overrides 

Noticed this issue when trying to override the current password pattern in a single use.
Merge pull request #3846 from sjonnet19/patch-1

Allow declarative pattern overrides