diff --git a/source/ubl-settings-repomanager.h b/source/ubl-settings-repomanager.h
index 6f0eb25..fb6743f 100644
--- a/source/ubl-settings-repomanager.h
+++ b/source/ubl-settings-repomanager.h
@@ -119,11 +119,11 @@ Key-Type: ",type,"\n\
 Key-Length: 1024\n\
 Subkey-Type: ELG-E\n\
 Subkey-Length: ",strength,"\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\
+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\
+Passphrase: '",password,"'\n\
 %commit\n\
 %echo done\n\
 EOF\n\n",NULL)
@@ -135,8 +135,8 @@ Key-Length: 1024\n\
 Subkey-Type: ELG-E\n\
 Subkey-Length: ",strength,"\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\
+!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\
 %no-protection\n\
 %commit\n\
diff --git a/ubl-settings-repomanager-key.glade b/ubl-settings-repomanager-key.glade
index 7801c82..cd15e73 100644
--- a/ubl-settings-repomanager-key.glade
+++ b/ubl-settings-repomanager-key.glade
@@ -345,6 +345,7 @@
                                   <object class="GtkEntry" id="PasswordEntry">
                                     <property name="visible">True</property>
                                     <property name="can-focus">True</property>
+                                    <property name="max-length">128</property>
                                     <property name="visibility">False</property>
                                     <property name="invisible-char">*</property>
                                   </object>
@@ -383,6 +384,7 @@
                                   <object class="GtkEntry" id="PasswordConfirmationEntry">
                                     <property name="visible">True</property>
                                     <property name="can-focus">True</property>
+                                    <property name="max-length">128</property>
                                     <property name="visibility">False</property>
                                     <property name="invisible-char">*</property>
                                   </object>