diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c
index 983a806..9d6645b 100644
--- a/source/ubl-settings-usergroups.c
+++ b/source/ubl-settings-usergroups.c
@@ -1667,11 +1667,18 @@ void yon_system_load(ubl_settings_usergroups_system_window *window){
 		int parsed_size=0;
 		config_str parsed = yon_char_parse(shadow[i],&parsed_size,":");
 		if (yon_gtk_list_store_find_text(window->liststore1,&iter,2,parsed[0])){
-			GDateTime *date = g_date_time_new_from_unix_local(atol(parsed[2]));
+			GDateTime *date = g_date_time_new_from_unix_local(atol(parsed[2])*24*60*60);
 			char *date_string;
 				date_string = g_date_time_format(date,"%Y-%m-%d");
+				g_date_time_unref(date);
+				char *expiration_string="";
+				if (parsed_size>7&&!yon_char_is_empty(parsed[7])){
+					date = g_date_time_new_from_unix_local(atol(parsed[7])*24*60*60);
+					expiration_string = g_date_time_format(date,"%Y-%m-%d");
+					g_date_time_unref(date);
+				}
 			
-			gtk_list_store_set(window->liststore1,&iter,8,parsed_size>2?date_string:"",9,parsed_size>7?parsed[7]:"",10,parsed_size>3?parsed[3]:"",11,parsed_size>4?parsed[4]:"",12,parsed_size>5?parsed[5]:"",13,parsed_size>2?parsed[6]:"",-1);
+			gtk_list_store_set(window->liststore1,&iter,8,parsed_size>2?date_string:"",9,expiration_string,10,parsed_size>3?parsed[3]:"",11,parsed_size>4?parsed[4]:"",12,parsed_size>5?parsed[5]:"",13,parsed_size>2?parsed[6]:"",-1);
 		}
 	}
 }