diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c
index e24015a..88de742 100644
--- a/source/ubl-settings-repomanager.c
+++ b/source/ubl-settings-repomanager.c
@@ -907,7 +907,9 @@ void on_key_generate_accept(GtkWidget *self, key_creation_window* window){
     }
     char *expire = NULL;
     if (gtk_combo_box_get_active(GTK_COMBO_BOX(window->ExpireCombo))==1){
-        expire = yon_char_from_int(yon_calendar_get_last_date());
+        GDateTime *datetime = g_date_time_new_from_unix_local(yon_calendar_get_last_date());
+        expire = g_date_time_format(datetime,"%Y%m%dT000000");
+
     }
     const char *password = gtk_entry_get_text(GTK_ENTRY(window->PasswordEntry));
     const char *password_confirm = gtk_entry_get_text(GTK_ENTRY(window->PasswordConfirmationEntry));