diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index 35d5dbc8b..17911e1f5 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -1932,7 +1932,8 @@ void CInfoViewer::show_Data (bool calledFromEvent)
 	}
 
 	time_t jetzt = time (NULL);
-	time_t cur_start_time = info_CurrentNext.current_zeit.startzeit;
+	time_t curr_start_time = info_CurrentNext.current_zeit.startzeit;
+	time_t next_start_time = info_CurrentNext.next_zeit.startzeit;
 
 	const char *unit_short_minute = g_Locale->getText(LOCALE_UNIT_SHORT_MINUTE);
 
@@ -1954,7 +1955,7 @@ void CInfoViewer::show_Data (bool calledFromEvent)
 				snprintf(runningRest, sizeof(runningRest), "%d +%d %s", info_CurrentNext.current_zeit.dauer / 60, -rest, unit_short_minute);
 		}
 
-		struct tm *pStartZeit = localtime (&cur_start_time);
+		struct tm *pStartZeit = localtime (&curr_start_time);
 		snprintf (runningStart, sizeof(runningStart), "%02d:%02d", pStartZeit->tm_hour, pStartZeit->tm_min);
 	} else
 		last_curr_id = 0;
@@ -1962,7 +1963,7 @@ void CInfoViewer::show_Data (bool calledFromEvent)
 	if (info_CurrentNext.flags & CSectionsdClient::epgflags::has_next) {
 		unsigned dauer = info_CurrentNext.next_zeit.dauer / 60;
 		snprintf (nextDuration, sizeof(nextDuration), "%d %s", dauer, unit_short_minute);
-		struct tm *pStartZeit = localtime (&cur_start_time);
+		struct tm *pStartZeit = localtime (&next_start_time);
 		snprintf (nextStart, sizeof(nextStart), "%02d:%02d", pStartZeit->tm_hour, pStartZeit->tm_min);
 	} else
 		last_next_id = 0;
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index ab7e00dd9..ededd2b23 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -482,25 +482,8 @@ int CNeutrinoApp::loadSetup(const char * fname)
 #endif
 
 	g_settings.ci_standby_reset = configfile.getInt32("ci_standby_reset", 0);
-
-#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
-	for (unsigned int i = 0; i < cCA::GetInstance()->GetNumberCISlots(); i++) {
-		sprintf(cfg_key, "ci_clock_%d", i);
-		g_settings.ci_clock[i] = configfile.getInt32(cfg_key, 6);
-	}
-#else
-	for (unsigned int i = 0; i < cCA::GetInstance()->GetNumberCISlots(); i++) {
-		sprintf(cfg_key, "ci_clock_%d", i);
-		g_settings.ci_clock[i] = configfile.getInt32(cfg_key, 9);
-	}
-#endif
-
 #if BOXMODEL_VUPLUS
 	g_settings.ci_delay = configfile.getInt32("ci_delay", 256);
-	for (unsigned int i = 0; i < cCA::GetInstance()->GetNumberCISlots(); i++) {
-		sprintf(cfg_key, "ci_rpr_%d", i);
-		g_settings.ci_rpr[i] = configfile.getInt32(cfg_key, 9);
-	}
 #endif
 	for (unsigned int i = 0; i < cCA::GetInstance()->GetNumberCISlots(); i++) {
 		sprintf(cfg_key, "ci_ignore_messages_%d", i);
@@ -509,6 +492,16 @@ int CNeutrinoApp::loadSetup(const char * fname)
 		g_settings.ci_save_pincode[i] = configfile.getInt32(cfg_key, 0);
 		sprintf(cfg_key, "ci_pincode_%d", i);
 		g_settings.ci_pincode[i] = configfile.getString(cfg_key, "");
+		sprintf(cfg_key, "ci_clock_%d", i);
+#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
+		g_settings.ci_clock[i] = configfile.getInt32(cfg_key, 6);
+#else
+		g_settings.ci_clock[i] = configfile.getInt32(cfg_key, 9);
+#endif
+#if BOXMODEL_VUPLUS
+		sprintf(cfg_key, "ci_rpr_%d", i);
+		g_settings.ci_rpr[i] = configfile.getInt32(cfg_key, 9);
+#endif
 	}
 	g_settings.ci_check_live = configfile.getInt32("ci_check_live", 0);
 	g_settings.ci_tuner = configfile.getInt32("ci_tuner", -1);
@@ -1495,17 +1488,8 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	configfile.setInt32( "standby_cpufreq", g_settings.standby_cpufreq);
 
 	configfile.setInt32("ci_standby_reset", g_settings.ci_standby_reset);
-	for (unsigned int i = 0; i < cCA::GetInstance()->GetNumberCISlots(); i++) {
-		sprintf(cfg_key, "ci_clock_%d", i);
-		configfile.setInt32(cfg_key, g_settings.ci_clock[i]);
-	}
-
 #if BOXMODEL_VUPLUS
 	configfile.setInt32("ci_delay", g_settings.ci_delay);
-	for (unsigned int i = 0; i < cCA::GetInstance()->GetNumberCISlots(); i++) {
-		sprintf(cfg_key, "ci_rpr_%d", i);
-		configfile.setInt32(cfg_key, g_settings.ci_rpr[i]);
-	}
 #endif
 	for (unsigned int i = 0; i < cCA::GetInstance()->GetNumberCISlots(); i++) {
 		sprintf(cfg_key, "ci_ignore_messages_%d", i);
@@ -1514,6 +1498,12 @@ void CNeutrinoApp::saveSetup(const char * fname)
 		configfile.setInt32(cfg_key, g_settings.ci_save_pincode[i]);
 		sprintf(cfg_key, "ci_pincode_%d", i);
 		configfile.setString(cfg_key, g_settings.ci_pincode[i]);
+		sprintf(cfg_key, "ci_clock_%d", i);
+		configfile.setInt32(cfg_key, g_settings.ci_clock[i]);
+#if BOXMODEL_VUPLUS
+		sprintf(cfg_key, "ci_rpr_%d", i);
+		configfile.setInt32(cfg_key, g_settings.ci_rpr[i]);
+#endif
 	}
 
 	configfile.setInt32("ci_check_live", g_settings.ci_check_live);