diff --git a/core/user_settings/app_languages.php b/core/user_settings/app_languages.php
index 8de84d600e..1b2e24f707 100644
--- a/core/user_settings/app_languages.php
+++ b/core/user_settings/app_languages.php
@@ -1,6 +1,46 @@
 <?php
 #This file was last reorganized on 27th of September 2017 01:41:52 PM UTC
 
+$text['title-user_setting-edit']['en-us'] = "User Setting";
+$text['title-user_setting-edit']['ar-eg'] = "";
+$text['title-user_setting-edit']['de-at'] = "Benutzereinstellung"; //copied from de-de
+$text['title-user_setting-edit']['de-ch'] = "Benutzereinstellung"; //copied from de-de
+$text['title-user_setting-edit']['de-de'] = "Benutzereinstellung";
+$text['title-user_setting-edit']['es-cl'] = "Configuración de Usuario";
+$text['title-user_setting-edit']['es-mx'] = "Configuración de Usuario"; //copied from es-cl
+$text['title-user_setting-edit']['fr-ca'] = "Cadre de l'utilisateur"; //copied from fr-fr
+$text['title-user_setting-edit']['fr-fr'] = "Cadre de l'utilisateur";
+$text['title-user_setting-edit']['he-il'] = "";
+$text['title-user_setting-edit']['it-it'] = "Parametri Utente";
+$text['title-user_setting-edit']['nl-nl'] = "";
+$text['title-user_setting-edit']['pl-pl'] = "";
+$text['title-user_setting-edit']['pt-br'] = "Definição do Utilizador"; //copied from pt-pt
+$text['title-user_setting-edit']['pt-pt'] = "Definição do Utilizador";
+$text['title-user_setting-edit']['ro-ro'] = "";
+$text['title-user_setting-edit']['ru-ru'] = "Параметры пользователя";
+$text['title-user_setting-edit']['sv-se'] = "Användarinställning";
+$text['title-user_setting-edit']['uk-ua'] = "";
+
+$text['title-user_setting-add']['en-us'] = "User Setting Add";
+$text['title-user_setting-add']['ar-eg'] = "";
+$text['title-user_setting-add']['de-at'] = "Benutzereinstellung hinzufügen"; //copied from de-de
+$text['title-user_setting-add']['de-ch'] = "Benutzereinstellung hinzufügen"; //copied from de-de
+$text['title-user_setting-add']['de-de'] = "Benutzereinstellung hinzufügen";
+$text['title-user_setting-add']['es-cl'] = "Ajuste del usuario Agregar";
+$text['title-user_setting-add']['es-mx'] = "Ajuste del usuario Agregar"; //copied from es-cl
+$text['title-user_setting-add']['fr-ca'] = "Cadre utilisateur Ajouter"; //copied from fr-fr
+$text['title-user_setting-add']['fr-fr'] = "Cadre utilisateur Ajouter";
+$text['title-user_setting-add']['he-il'] = "";
+$text['title-user_setting-add']['it-it'] = "Inserimento Parametri Utente";
+$text['title-user_setting-add']['nl-nl'] = "";
+$text['title-user_setting-add']['pl-pl'] = "";
+$text['title-user_setting-add']['pt-br'] = "Usuário setting Adicionar"; //copied from pt-pt
+$text['title-user_setting-add']['pt-pt'] = "Usuário setting Adicionar";
+$text['title-user_setting-add']['ro-ro'] = "";
+$text['title-user_setting-add']['ru-ru'] = "Добавить параметры пользователя";
+$text['title-user_setting-add']['sv-se'] = "Lägg Till Användarinställning";
+$text['title-user_setting-add']['uk-ua'] = "";
+
 $text['title-user_dashboard']['en-us'] = "Dashboard";
 $text['title-user_dashboard']['ar-eg'] = "الصفحه الرئيسيه للمستخدم";
 $text['title-user_dashboard']['de-at'] = "Benutzerübersicht"; //copied from de-de
@@ -1821,6 +1861,47 @@ $text['header-user_dashboard']['ru-ru'] = "Панель пользователя
 $text['header-user_dashboard']['sv-se'] = "Dashboard";
 $text['header-user_dashboard']['uk-ua'] = "Панель користувача";
 
+
+$text['header-user_setting-edit']['en-us'] = "User Setting";
+$text['header-user_setting-edit']['ar-eg'] = "";
+$text['header-user_setting-edit']['de-at'] = "Benutzereinstellung"; //copied from de-de
+$text['header-user_setting-edit']['de-ch'] = "Benutzereinstellung"; //copied from de-de
+$text['header-user_setting-edit']['de-de'] = "Benutzereinstellung";
+$text['header-user_setting-edit']['es-cl'] = "Configuración de Usuario";
+$text['header-user_setting-edit']['es-mx'] = "Configuración de Usuario"; //copied from es-cl
+$text['header-user_setting-edit']['fr-ca'] = "Cadre de l'utilisateur"; //copied from fr-fr
+$text['header-user_setting-edit']['fr-fr'] = "Cadre de l'utilisateur";
+$text['header-user_setting-edit']['he-il'] = "";
+$text['header-user_setting-edit']['it-it'] = "Parametru Utente";
+$text['header-user_setting-edit']['nl-nl'] = "";
+$text['header-user_setting-edit']['pl-pl'] = "";
+$text['header-user_setting-edit']['pt-br'] = "Definição do Utilizador"; //copied from pt-pt
+$text['header-user_setting-edit']['pt-pt'] = "Definição do Utilizador";
+$text['header-user_setting-edit']['ro-ro'] = "";
+$text['header-user_setting-edit']['ru-ru'] = "Параметры пользователя";
+$text['header-user_setting-edit']['sv-se'] = "Användarinställning";
+$text['header-user_setting-edit']['uk-ua'] = "";
+
+$text['header-user_setting-add']['en-us'] = "User Setting Add";
+$text['header-user_setting-add']['ar-eg'] = "";
+$text['header-user_setting-add']['de-at'] = "Benutzereinstellung hinzufügen"; //copied from de-de
+$text['header-user_setting-add']['de-ch'] = "Benutzereinstellung hinzufügen"; //copied from de-de
+$text['header-user_setting-add']['de-de'] = "Benutzereinstellung hinzufügen";
+$text['header-user_setting-add']['es-cl'] = "Ajuste del usuario Agregar";
+$text['header-user_setting-add']['es-mx'] = "Ajuste del usuario Agregar"; //copied from es-cl
+$text['header-user_setting-add']['fr-ca'] = "Cadre utilisateur Ajouter"; //copied from fr-fr
+$text['header-user_setting-add']['fr-fr'] = "Cadre utilisateur Ajouter";
+$text['header-user_setting-add']['he-il'] = "";
+$text['header-user_setting-add']['it-it'] = "Inserire Parametro Utente";
+$text['header-user_setting-add']['nl-nl'] = "";
+$text['header-user_setting-add']['pl-pl'] = "";
+$text['header-user_setting-add']['pt-br'] = "Usuário setting Adicionar"; //copied from pt-pt
+$text['header-user_setting-add']['pt-pt'] = "Usuário setting Adicionar";
+$text['header-user_setting-add']['ro-ro'] = "";
+$text['header-user_setting-add']['ru-ru'] = "Добавить параметр пользователя";
+$text['header-user_setting-add']['sv-se'] = "Lägg Till Användarinställning";
+$text['header-user_setting-add']['uk-ua'] = "";
+
 $text['description-user_language']['en-us'] = "Select the language.";
 $text['description-user_language']['ar-eg'] = "اختيار الغة";
 $text['description-user_language']['de-at'] = "Sprache auswählen"; //copied from de-de
diff --git a/core/user_settings/user_settings.php b/core/user_settings/user_settings.php
index a2fbfed24d..85fd737f8e 100644
--- a/core/user_settings/user_settings.php
+++ b/core/user_settings/user_settings.php
@@ -248,10 +248,10 @@
 			echo "	</td>\n";
 			echo "</tr>\n";
 			$previous_category = $row['user_setting_category'];
-			if ($c==0) { $c=1; } else { $c=0; }
-		} //end foreach
-		unset($sql, $user_settings);
-	} //end if results
+			$c = $c ? 0 : 1;
+		}
+	}
+	unset($sql);
 
 	echo "<tr>\n";
 	echo "<td colspan='20' align='left'>\n";
@@ -277,6 +277,8 @@
 
 	echo "<br /><br />";
 
+	unset($user_settings);
+
 	// check or uncheck all category checkboxes
 	if (sizeof($subcat_ids) > 0) {
 		echo "<script>\n";
diff --git a/core/users/app_languages.php b/core/users/app_languages.php
index 92afc7396a..8fc1c99c24 100644
--- a/core/users/app_languages.php
+++ b/core/users/app_languages.php
@@ -1,46 +1,6 @@
 <?php
 #This file was last reorganized on 19th of September 2017 08:54:24 AM UTC
 
-$text['title-user_setting-edit']['en-us'] = "User Setting";
-$text['title-user_setting-edit']['ar-eg'] = "";
-$text['title-user_setting-edit']['de-at'] = "Benutzereinstellung"; //copied from de-de
-$text['title-user_setting-edit']['de-ch'] = "Benutzereinstellung"; //copied from de-de
-$text['title-user_setting-edit']['de-de'] = "Benutzereinstellung";
-$text['title-user_setting-edit']['es-cl'] = "Configuración de Usuario";
-$text['title-user_setting-edit']['es-mx'] = "Configuración de Usuario"; //copied from es-cl
-$text['title-user_setting-edit']['fr-ca'] = "Cadre de l'utilisateur"; //copied from fr-fr
-$text['title-user_setting-edit']['fr-fr'] = "Cadre de l'utilisateur";
-$text['title-user_setting-edit']['he-il'] = "";
-$text['title-user_setting-edit']['it-it'] = "Parametri Utente";
-$text['title-user_setting-edit']['nl-nl'] = "";
-$text['title-user_setting-edit']['pl-pl'] = "";
-$text['title-user_setting-edit']['pt-br'] = "Definição do Utilizador"; //copied from pt-pt
-$text['title-user_setting-edit']['pt-pt'] = "Definição do Utilizador";
-$text['title-user_setting-edit']['ro-ro'] = "";
-$text['title-user_setting-edit']['ru-ru'] = "Параметры пользователя";
-$text['title-user_setting-edit']['sv-se'] = "Användarinställning";
-$text['title-user_setting-edit']['uk-ua'] = "";
-
-$text['title-user_setting-add']['en-us'] = "User Setting Add";
-$text['title-user_setting-add']['ar-eg'] = "";
-$text['title-user_setting-add']['de-at'] = "Benutzereinstellung hinzufügen"; //copied from de-de
-$text['title-user_setting-add']['de-ch'] = "Benutzereinstellung hinzufügen"; //copied from de-de
-$text['title-user_setting-add']['de-de'] = "Benutzereinstellung hinzufügen";
-$text['title-user_setting-add']['es-cl'] = "Ajuste del usuario Agregar";
-$text['title-user_setting-add']['es-mx'] = "Ajuste del usuario Agregar"; //copied from es-cl
-$text['title-user_setting-add']['fr-ca'] = "Cadre utilisateur Ajouter"; //copied from fr-fr
-$text['title-user_setting-add']['fr-fr'] = "Cadre utilisateur Ajouter";
-$text['title-user_setting-add']['he-il'] = "";
-$text['title-user_setting-add']['it-it'] = "Inserimento Parametri Utente";
-$text['title-user_setting-add']['nl-nl'] = "";
-$text['title-user_setting-add']['pl-pl'] = "";
-$text['title-user_setting-add']['pt-br'] = "Usuário setting Adicionar"; //copied from pt-pt
-$text['title-user_setting-add']['pt-pt'] = "Usuário setting Adicionar";
-$text['title-user_setting-add']['ro-ro'] = "";
-$text['title-user_setting-add']['ru-ru'] = "Добавить параметры пользователя";
-$text['title-user_setting-add']['sv-se'] = "Lägg Till Användarinställning";
-$text['title-user_setting-add']['uk-ua'] = "";
-
 $text['title-user_manager']['en-us'] = "User Manager";
 $text['title-user_manager']['ar-eg'] = "";
 $text['title-user_manager']['de-at'] = "Benutzerverwaltung"; //copied from de-de
@@ -1421,46 +1381,6 @@ $text['label-12-hour']['ru-ru'] = "12-часовой";
 $text['label-12-hour']['sv-se'] = "12-Timmars";
 $text['label-12-hour']['uk-ua'] = "12-годинний";
 
-$text['header-user_setting-edit']['en-us'] = "User Setting";
-$text['header-user_setting-edit']['ar-eg'] = "";
-$text['header-user_setting-edit']['de-at'] = "Benutzereinstellung"; //copied from de-de
-$text['header-user_setting-edit']['de-ch'] = "Benutzereinstellung"; //copied from de-de
-$text['header-user_setting-edit']['de-de'] = "Benutzereinstellung";
-$text['header-user_setting-edit']['es-cl'] = "Configuración de Usuario";
-$text['header-user_setting-edit']['es-mx'] = "Configuración de Usuario"; //copied from es-cl
-$text['header-user_setting-edit']['fr-ca'] = "Cadre de l'utilisateur"; //copied from fr-fr
-$text['header-user_setting-edit']['fr-fr'] = "Cadre de l'utilisateur";
-$text['header-user_setting-edit']['he-il'] = "";
-$text['header-user_setting-edit']['it-it'] = "Parametru Utente";
-$text['header-user_setting-edit']['nl-nl'] = "";
-$text['header-user_setting-edit']['pl-pl'] = "";
-$text['header-user_setting-edit']['pt-br'] = "Definição do Utilizador"; //copied from pt-pt
-$text['header-user_setting-edit']['pt-pt'] = "Definição do Utilizador";
-$text['header-user_setting-edit']['ro-ro'] = "";
-$text['header-user_setting-edit']['ru-ru'] = "Параметры пользователя";
-$text['header-user_setting-edit']['sv-se'] = "Användarinställning";
-$text['header-user_setting-edit']['uk-ua'] = "";
-
-$text['header-user_setting-add']['en-us'] = "User Setting Add";
-$text['header-user_setting-add']['ar-eg'] = "";
-$text['header-user_setting-add']['de-at'] = "Benutzereinstellung hinzufügen"; //copied from de-de
-$text['header-user_setting-add']['de-ch'] = "Benutzereinstellung hinzufügen"; //copied from de-de
-$text['header-user_setting-add']['de-de'] = "Benutzereinstellung hinzufügen";
-$text['header-user_setting-add']['es-cl'] = "Ajuste del usuario Agregar";
-$text['header-user_setting-add']['es-mx'] = "Ajuste del usuario Agregar"; //copied from es-cl
-$text['header-user_setting-add']['fr-ca'] = "Cadre utilisateur Ajouter"; //copied from fr-fr
-$text['header-user_setting-add']['fr-fr'] = "Cadre utilisateur Ajouter";
-$text['header-user_setting-add']['he-il'] = "";
-$text['header-user_setting-add']['it-it'] = "Inserire Parametro Utente";
-$text['header-user_setting-add']['nl-nl'] = "";
-$text['header-user_setting-add']['pl-pl'] = "";
-$text['header-user_setting-add']['pt-br'] = "Usuário setting Adicionar"; //copied from pt-pt
-$text['header-user_setting-add']['pt-pt'] = "Usuário setting Adicionar";
-$text['header-user_setting-add']['ro-ro'] = "";
-$text['header-user_setting-add']['ru-ru'] = "Добавить параметр пользователя";
-$text['header-user_setting-add']['sv-se'] = "Lägg Till Användarinställning";
-$text['header-user_setting-add']['uk-ua'] = "";
-
 $text['header-user_manager']['en-us'] = "Users";
 $text['header-user_manager']['ar-eg'] = "";
 $text['header-user_manager']['de-at'] = "Benutzerverwaltung"; //copied from de-de