diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionWp8Model.cs
index 09876067..944cf9e1 100644
--- a/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionWp8Model.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionWp8Model.cs
@@ -12,7 +12,7 @@ namespace CampusAppWP8.Model.Person
 
     /// <summary>Person function model.</summary>
     /// <remarks>Stubbfel, 05.09.2013.</remarks>
-    public class PersonFunctionWp8Model : CampusAppWPortalLib8.Model.Person.PersonFunctionModel 
+    public class PersonFunctionWp8Model : CampusAppWPortalLib8.Model.Person.PersonFunctionModel
     {
         #region Property
 
diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs
index e3135c13..474f3fea 100644
--- a/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs
@@ -22,7 +22,7 @@ namespace CampusAppWP8.Model.Person
         /// <returns>The person.</returns>
         public new PersonWp8Model GetPerson(string id)
         {
-            IPersonModel<PersonWp8Model> tmpPerson = base.GetPerson(id);
+            IPersonModel<IPersonFunctionModel> tmpPerson = base.GetPerson(id);
             return tmpPerson as PersonWp8Model;
         }
     }
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs
index 023cde77..9126ab91 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs
@@ -83,7 +83,7 @@ namespace CampusAppWP8.Pages.Dev
                 {
                     this.resultAppStoreKey = NavigationContext.QueryString[Constants.ParamQRResultKey];
                 }
-
+                this.isInAutofocus = true;
                 this.cam = new PhotoCamera(CameraType.Primary);
                 this.cam.Initialized += new EventHandler<CameraOperationCompletedEventArgs>(this.Cam_Initialized);
                 this.cam.AutoFocusCompleted += new EventHandler<CameraOperationCompletedEventArgs>(this.Cam_AutoFocusCompl);
@@ -176,7 +176,7 @@ namespace CampusAppWP8.Pages.Dev
         /// <param name="e">Camera operation completed event information.</param>
         private void Cam_AutoFocusCompl(object sender, CameraOperationCompletedEventArgs e)
         {
-            this.isInAutofocus = false;
+            //this.isInAutofocus = false;
         }
 
         /// <summary>
@@ -195,8 +195,6 @@ namespace CampusAppWP8.Pages.Dev
                     this.cam.FocusAtPoint(
                         pos.Y / this.camView.ActualHeight,
                         1.0 - (pos.X / this.camView.ActualWidth));
-
-                    this.isInAutofocus = true;
                 }
                 else if (this.cam.IsFocusSupported == true)
                 {
@@ -243,6 +241,10 @@ namespace CampusAppWP8.Pages.Dev
                     }
                 });
             }
+            else
+            {
+                this.cam.Focus();
+            }
         }
 
         /// <summary>
@@ -255,12 +257,13 @@ namespace CampusAppWP8.Pages.Dev
 
             while (!this.captureThreadExit)
             {
-                if (this.isInAutofocus == false)
-                {
+                //if (this.isInAutofocus == false)
+                //{
                     this.cam.GetPreviewBufferArgb32(buffer);
 
                     this.OnCaptureImage(buffer, (int)resolution.Width, (int)resolution.Height);
-                }
+                    this.isInAutofocus = true;
+                //}
 
                 System.Threading.Thread.Sleep(1000);
             }