diff --git a/e107_admin/auth.php b/e107_admin/auth.php
index 0286f4d3e..234481d4e 100644
--- a/e107_admin/auth.php
+++ b/e107_admin/auth.php
@@ -25,8 +25,11 @@ e107::getDb()->db_Mark_Time('(Start auth.php)');
 define('e_CAPTCHA_FONTCOLOR','#F9A533');
 
 
+
+
 // Required for a clean v1.x -> v2 upgrade. 
-$core = e107::getConfig('core'); 		
+$core = e107::getConfig('core');
+
 if($core->get('admintheme') != 'bootstrap3')
 {
 	$core->update('admintheme','bootstrap3');
@@ -36,11 +39,13 @@ if($core->get('admintheme') != 'bootstrap3')
 	$core->save();	
 	e107::getRedirect()->redirect(e_SELF);		
 }
-if($core->get('admincss') === 'admin_dark.css' || $core->get('admincss') === 'admin_light.css')
+
+$admincss = trim($core->get('admincss'));
+if(empty($admincss) || $admincss === 'admin_dark.css' || $admincss === 'admin_light.css')
 {
 	$core->update('admincss','css/bootstrap-dark.min.css');
-	$core->save();
-	e107::getRedirect()->redirect(e_SELF);	;
+	$core->save(false,true);
+	e107::getRedirect()->redirect(e_SELF);
 }
 
 // Check Admin-Perms for current language and redirect if necessary.