Add user and fqdn to the key comment and allow overriding it