No need for double replace
Add CP tag only when renamer or unique tag is enabled.
Safari hanging on password input creation

Fix #3997
Merge branch 'develop'