diff --git a/source/ubl-settings-repomanager.h b/source/ubl-settings-repomanager.h
index 7f09479..d5ea5f4 100644
--- a/source/ubl-settings-repomanager.h
+++ b/source/ubl-settings-repomanager.h
@@ -119,9 +119,9 @@ Key-Type: ",type,"\n\
 Key-Length: 1024\n\
 Subkey-Type: ELG-E\n\
 Subkey-Length: ",strength,"\n\
-Name-Real: ",name,"\n\
-Name-Comment: ",comment,"\n\
-Name-Email: ",email,"\n\
+Name-Real: ",name,"\n",\
+!yon_char_is_empty(comment)?"Name-Comment: ":"",!yon_char_is_empty(comment)?comment:"",!yon_char_is_empty(comment)?"\n":""\
+"Name-Email: ",email,"\n\
 Expire-Date: ",!yon_char_is_empty(expire)?expire:"0","\n\
 Passphrase: ",password,"\n\
 %commit\n\