diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c
index 7b1ebf7..dd9427c 100644
--- a/source/ubl-settings-repomanager.c
+++ b/source/ubl-settings-repomanager.c
@@ -915,7 +915,7 @@ void on_key_generate_accept(GtkWidget *self, key_creation_window* window){
     if (!ex_status)
         yon_ubl_status_box_render(KEY_CREATION_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
     else 
-        yon_ubl_status_box_render(KEY_CREATION_FAILURE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
+        yon_ubl_status_box_render(KEY_CREATION_FAILURE_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
     gtk_widget_destroy(window->Window);
     yon_sign_list_update();
 }
diff --git a/source/ubl-settings-repomanager.h b/source/ubl-settings-repomanager.h
index e2c5fda..d25d215 100644
--- a/source/ubl-settings-repomanager.h
+++ b/source/ubl-settings-repomanager.h
@@ -107,7 +107,7 @@ Subkey-Length: ",strength,"\n\
 Name-Real: ",name,"\n\
 Name-Comment: ",comment,"\n\
 Name-Email: ",email,"\n\
-Expire-Date: ",expire,"\n\
+Expire-Date: ",!yon_char_is_empty(expire)?expire:"0","\n\
 Passphrase: ",password,"\n\
 %commit\n\
 %echo done\n\
@@ -122,7 +122,7 @@ Subkey-Length: ",strength,"\n\
 Name-Real: ",name,"\n\
 Name-Comment: ",comment,"\n\
 Name-Email: ",email,"\n\
-Expire-Date: ",expire,"\n\
+Expire-Date: ",!yon_char_is_empty(expire)?expire:"0","\n\
 %no-protection\n\
 %commit\n\
 %echo done\n\