diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
index 7f9fa3ca..95ef43d0 100644
--- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
+++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
@@ -140,6 +140,7 @@
     <Compile Include="Pages\Setting\FunctionSettingPage.xaml.cs">
       <DependentUpon>FunctionSettingPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\Setting\MensaSetting.cs" />
     <Compile Include="Pages\TimeTable\Appointment.xaml.cs">
       <DependentUpon>Appointment.xaml</DependentUpon>
     </Compile>
diff --git a/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs b/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs
index 4b062399..a6edb8a2 100644
--- a/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs
@@ -8,14 +8,34 @@
 //-----------------------------------------------------------------------
 namespace CampusAppWP8.Model.Setting
 {
+    using CampusAppWP8.Pages.Setting;
     using CampusAppWP8.Resources;
 
     /// <summary> Model for settings of the app. </summary>
     /// <remarks> Stubbfel, 15.10.2013. </remarks>
     public class AppSettings
     {
+        #region member
+        private static MensaSetting mensaSetting = new MensaSetting();
+        #endregion
         #region Property
 
+        public MensaSetting MensaSetting
+        {
+            get
+            {
+                return AppSettings.mensaSetting;
+            }
+
+            set
+            {
+                if (value != AppSettings.mensaSetting)
+                {
+                    AppSettings.mensaSetting = value;
+                }
+            }
+        }
+
         /// <summary> Gets or sets a value indicating whether the GeoWatch-Flag. </summary>
         /// <value> true if geo watch enable, false if not. </value>
         public bool GeoWatchEnable
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml
index 4a95b0de..b0a5ca68 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml
@@ -28,7 +28,7 @@
         <StackPanel  Grid.Row="0">
             <header:DefaultHeader Name="DefHeader" HeaderName="{Binding Path=LocalizedResources.Setting_General, Source={StaticResource LocalizedStrings}}"/>
         </StackPanel>
-        <phone:Pivot Grid.Row="1" Name="MensaPivot">
+        <phone:Pivot Grid.Row="1" Name="GeneralSettingPivot">
             <phone:Pivot.HeaderTemplate>
                 <DataTemplate>
                     <Grid Margin="0,-36,0,0">
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs
index cc241977..ce8e6b74 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs
@@ -10,6 +10,7 @@ namespace CampusAppWP8.Pages.Setting
 {
     using System.Windows.Navigation;
     using Microsoft.Phone.Controls;
+    using CampusAppWP8.Resources;
 
     /// <summary> Class for the AppSettingPage. </summary>
     /// <remarks> Stubbfel, 15.10.2013. </remarks>
@@ -31,6 +32,25 @@ namespace CampusAppWP8.Pages.Setting
 
         #region Method
 
+        /// <summary> Override the OnNavigatedTo method. </summary>
+        /// <remarks> Stubbfel, 15.10.2013. </remarks>
+        /// <seealso cref="M:System.Windows.Controls.Page.OnNavigatedTo(NavigationEventArgs)"/>
+        protected override void OnNavigatedTo(NavigationEventArgs e)
+        {
+            base.OnNavigatedTo(e);
+
+            string functionIndex;
+
+            if (NavigationMode.New != e.NavigationMode && NavigationContext.QueryString.TryGetValue(Constants.Param_FunctionSetting_Index, out functionIndex))
+            {
+                int oldIndex = App.LoadFromIsolatedStorage<int>(Constants.IsolatedStorage_GeneralSettingPageIndex);
+                this.GeneralSettingPivot.SelectedIndex = oldIndex;
+
+
+
+            }
+        }
+
         /// <summary> Override the OnNavigatedFrom method. </summary>
         /// <remarks> Stubbfel, 15.10.2013. </remarks>
         /// <seealso cref="M:System.Windows.Controls.Page.OnNavigatedFrom(NavigationEventArgs)"/>
@@ -40,7 +60,13 @@ namespace CampusAppWP8.Pages.Setting
             {
                 Settings.AppSetting.GeoWatchEnable = GeoWatchToggle.IsChecked.Value;
                 Settings.AppSetting.OnlyWifi = OnlyWiFiToggle.IsChecked.Value;
+                App.SaveToIsolatedStorage<int>(Constants.IsolatedStorage_GeneralSettingPageIndex, 0);
             }
+            else
+            {
+                App.SaveToIsolatedStorage<int>(Constants.IsolatedStorage_FunctionSettingPageIndex, this.GeneralSettingPivot.SelectedIndex);
+            }
+
         }
 
         #endregion
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml
index 76b584f7..703441f0 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml
@@ -43,7 +43,9 @@
             <phone:PivotItem 
                 Tag="{Binding Path=Constants.FunctionSetting_Mensa, Source={StaticResource Const}}"
                 Header="{Binding Path=LocalizedResources.MensaApp_Title, Source={StaticResource LocalizedStrings}}">
-                <Grid/>
+                <StackPanel Grid.Row="1">
+                    <toolkit:ToggleSwitch Name="AtomMensaToggle" Content="{Binding Path=LocalizedResources.Setting_AtomMensaSelection, Source={StaticResource LocalizedStrings}}"></toolkit:ToggleSwitch>
+                </StackPanel>
             </phone:PivotItem>
 
             <!--Pivotelement zwei-->
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml.cs
index 98cedb3f..a04c770a 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml.cs
@@ -29,6 +29,8 @@ namespace CampusAppWP8.Pages.Setting
             this.TagHandler.ItemsSource = this.taghandlerModel.List;
             int tagselIndex = this.taghandlerModel.GetIndexOrDefault(Settings.AppSetting.TagDefaultHandler.ToString());
             this.TagHandler.SelectedIndex = tagselIndex;
+
+            this.AtomMensaToggle.IsChecked = Settings.AppSetting.MensaSetting.AtomMensaSelection;
         }
 
         #endregion
@@ -63,6 +65,8 @@ namespace CampusAppWP8.Pages.Setting
         protected override void OnNavigatedFrom(NavigationEventArgs e)
         {
             Settings.AppSetting.TagDefaultHandler = (CampusAppWP8.Model.Setting.BTUTagDefaultHandler)Enum.Parse(typeof(CampusAppWP8.Model.Setting.BTUTagDefaultHandler), ((CampusAppWPortalLib8.Model.Utility.ListPickerItemModel)this.TagHandler.SelectedItem).Value);
+            Settings.AppSetting.MensaSetting.AtomMensaSelection = this.AtomMensaToggle.IsChecked.Value;
+
             if (NavigationMode.Back == e.NavigationMode)
             {
                 App.SaveToIsolatedStorage<string>(Constants.IsolatedStorage_FunctionSettingPageIndex, null);
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/MensaSetting.cs b/CampusAppWP8/CampusAppWP8/Pages/Setting/MensaSetting.cs
new file mode 100644
index 00000000..7dc25dac
--- /dev/null
+++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/MensaSetting.cs
@@ -0,0 +1,24 @@
+using CampusAppWP8.Resources;
+
+namespace CampusAppWP8.Pages.Setting
+{
+    public class MensaSetting
+    {
+        #region Property
+
+        public bool AtomMensaSelection
+        {
+            get
+            {
+                return App.LoadFromAppState<bool>(Constants.AppSetting_MensaSetting_AtomMensaSelection);
+            }
+
+            set
+            {
+                App.SaveToAppState<bool>(Constants.AppSetting_MensaSetting_AtomMensaSelection, value);
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
index 815f21df..b90c5f67 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
@@ -1221,6 +1221,15 @@ namespace CampusAppWP8.Resources {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die autom. Mensaauswahl ähnelt.
+        /// </summary>
+        public static string Setting_AtomMensaSelection {
+            get {
+                return ResourceManager.GetString("Setting_AtomMensaSelection", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die Funktionseinstellungen ähnelt.
         /// </summary>
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
index ab6e45d6..28f3bd7b 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
@@ -632,6 +632,9 @@
   <data name="Rooms" xml:space="preserve">
     <value>Räume</value>
   </data>
+  <data name="Setting_AtomMensaSelection" xml:space="preserve">
+    <value>autom. Mensaauswahl</value>
+  </data>
   <data name="Setting_Function" xml:space="preserve">
     <value>Funktionseinstellungen</value>
   </data>
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
index bf2c4707..44fe75b6 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
@@ -624,6 +624,9 @@
   <data name="PathSetting_Impressum" xml:space="preserve">
     <value>/Pages/Setting/Impressum.xaml</value>
   </data>
+  <data name="AppSetting_MensaSetting_AtomMensaSelection" xml:space="preserve">
+    <value>AtomMensaSelection</value>
+  </data>
   <data name="FunctionSetting_Mensa" xml:space="preserve">
     <value>Mensafunction</value>
   </data>
@@ -636,6 +639,9 @@
   <data name="IsolatedStorage_FunctionSettingPageIndex" xml:space="preserve">
     <value>FunctionSettingPageIndex</value>
   </data>
+  <data name="IsolatedStorage_GeneralSettingPageIndex" xml:space="preserve">
+    <value>GeneralSettingPageIndex</value>
+  </data>
   <data name="Param_FunctionSetting_Index" xml:space="preserve">
     <value>FunctionSettingIndex</value>
   </data>
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs
index e40dccbf..fb4eb158 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs
@@ -150,6 +150,15 @@ namespace CampusAppWP8.Resources {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die AtomMensaSelection ähnelt.
+        /// </summary>
+        public static string AppSetting_MensaSetting_AtomMensaSelection {
+            get {
+                return ResourceManager.GetString("AppSetting_MensaSetting_AtomMensaSelection", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die OnlyWifi ähnelt.
         /// </summary>
@@ -528,6 +537,15 @@ namespace CampusAppWP8.Resources {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die GeneralSettingPageIndex ähnelt.
+        /// </summary>
+        public static string IsolatedStorage_GeneralSettingPageIndex {
+            get {
+                return ResourceManager.GetString("IsolatedStorage_GeneralSettingPageIndex", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die LectureAppointment ähnelt.
         /// </summary>
diff --git a/CampusAppWP8/CampusAppWP8/Settings.cs b/CampusAppWP8/CampusAppWP8/Settings.cs
index a02b99fb..06754711 100644
--- a/CampusAppWP8/CampusAppWP8/Settings.cs
+++ b/CampusAppWP8/CampusAppWP8/Settings.cs
@@ -69,6 +69,11 @@ namespace CampusAppWP8
             }
         }
 
+        #endregion
+
+        #region method
+
+
         #endregion
     }
 }