diff --git a/CampusAppWP8/CampusAppWP8/Model/Setting/MensaSetting.cs b/CampusAppWP8/CampusAppWP8/Model/Setting/MensaSetting.cs
index 7bd45f60..80c9ff1f 100644
--- a/CampusAppWP8/CampusAppWP8/Model/Setting/MensaSetting.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/Setting/MensaSetting.cs
@@ -47,7 +47,10 @@ using CampusAppWPortalLib8.Model.Settings;
             }
         }
 
-        /// <summary> Gets or sets the selected mensa. </summary>
+        /// <summary>
+        ///     Gets or sets the selected mensa. That means if the Campus is UserSettingCampus then
+        ///     return the Campus from user profil.
+        /// </summary>
         /// <value> The selected mensa. </value>
         public Campus SelectedMensa
         {
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
index a6770bd0..9b1fa2e1 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
@@ -190,7 +190,7 @@ namespace CampusAppWP8.Pages.Mensa
             {
                 if (mensaCampus == Campus.UserSettingCampus)
                 {
-                    this.InitializeFeed(Settings.UserProfil.DefaultCampus);
+                    this.InitializeFeed(Settings.AppSetting.FunctionSettings.MensaSetting.SelectedMensa);
                 }
                 else
                 {
@@ -231,14 +231,14 @@ namespace CampusAppWP8.Pages.Mensa
         /// <remarks> Stubbfel, 15.10.2013. </remarks>
         private void InitializeFeed()
         {
-            if (Settings.AppSetting.LocatingSetting.GeoWatchEnable)
+            if (Settings.AppSetting.LocatingSetting.GeoWatchEnable && Settings.AppSetting.FunctionSettings.MensaSetting.AtomMensaSelection)
             {
                 Thread thread = new Thread(new ThreadStart(this.DeterminCurrentCampusAndLoadFeed));
                 thread.Start();
             }
             else
             {
-                this.InitializeFeed(Settings.UserProfil.DefaultCampus);
+                this.InitializeFeed(Settings.AppSetting.FunctionSettings.MensaSetting.SelectedMensa);
             }
         }