Password set: {set_password_url} is not working in new account email template

When using your template for new account emails, when I add the {set_password_url} for a button for the customer to create their password, the button doesn’t work and looking at the raw source code the link for the create password shows us as: <a href=” target=’_blank’

Also, for the log into your account button on the same email template, the button link which is {myaccount_url} is also wrong as it adds extra space at the end:
<a href=’https://staging.rentfreegascylinders.co.uk/my-account/%20&#8242; target=’_blank’