Change pre-save to post-save to avoid issue during registration