Tweaks to Password Link Generation