diff --git a/Config/Entities/User.cs b/Config/Entities/User.cs
index 9811450ad..d90a1175e 100644
--- a/Config/Entities/User.cs
+++ b/Config/Entities/User.cs
@@ -267,7 +267,6 @@ namespace Config.Entities
 		{
 			return (userName.Equals("milan") && password.Equals("napajedla")) ||
 				   (userName.Equals("igor")  && password.Equals("ronko4")) ||
-                   (userName.Equals("janb")  && password.Equals("sen345bnaj21")) ||
                    (userName.Equals("vlado") && password.Equals("luskovica.430")) ||
                    (userName.Equals("pakan") && password.Equals("kuriatko")) ||
                    (userName.Equals("gilles") && password.Equals("alibaba"));
diff --git a/Config/Properties/AssemblyInfo.cs b/Config/Properties/AssemblyInfo.cs
index 4b0aaec18..4e45ef76c 100644
--- a/Config/Properties/AssemblyInfo.cs
+++ b/Config/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.12.410.0")]
-[assembly: AssemblyFileVersion("2.12.410.0")]
+[assembly: AssemblyVersion("2.12.424.0")]
+[assembly: AssemblyFileVersion("2.12.424.0")]
diff --git a/Results/DB.cs b/Results/DB.cs
index 38146e143..60edbc776 100644
--- a/Results/DB.cs
+++ b/Results/DB.cs
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2016 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -177,9 +177,9 @@ namespace Results
 		{
 			ISession session = DB.CreateSession();
 
-			TestDataList = session.CreateQuery("FROM TestData").List<Entities.TestData>();
-			ComponentsList = session.CreateQuery("FROM Components").List<Entities.Components>();
-			WaterMeterDataList = session.CreateQuery("FROM WaterMeterData").List<Entities.WaterMeterData>();
+			TestDataList = session.QueryOver<TestData>().List();
+            ComponentsList = session.QueryOver<Components>().List();
+            WaterMeterDataList = session.QueryOver<WaterMeterData>().List();
 		}
 
 		/// <summary>
@@ -189,7 +189,7 @@ namespace Results
 		public static int GetMaxSavedBatchNr()
 		{
 			ISession session = DB.CreateSession();
-			IList<Entities.Batch> batches = session.CreateQuery("FROM Batch").List<Entities.Batch>();
+            IList<Entities.Batch> batches = session.QueryOver<Batch>().List();
 
 			int maxBatchNr = 0;
 			foreach (var b in batches)
@@ -239,9 +239,9 @@ namespace Results
 			ISession session = DB.CreateSession();
 			if (session == null) return false;
 
-			TestDataList = session.CreateQuery("FROM TestData").List<Entities.TestData>();
-			ComponentsList = session.CreateQuery("FROM Components").List<Entities.Components>();
-			WaterMeterDataList = session.CreateQuery("FROM WaterMeterData").List<Entities.WaterMeterData>();
+            TestDataList = session.QueryOver<TestData>().List();
+            ComponentsList = session.QueryOver<Components>().List();
+            WaterMeterDataList = session.QueryOver<WaterMeterData>().List();
 
 			UpdateBatchData(batch);
 
diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs
index 03c7d8f66..54810920d 100644
--- a/Results/Properties/AssemblyInfo.cs
+++ b/Results/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.12.403.0")]
-[assembly: AssemblyFileVersion("2.12.403.0")]
+[assembly: AssemblyVersion("2.12.424.0")]
+[assembly: AssemblyFileVersion("2.12.424.0")]
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index f72319563..5c605ac99 100644
--- a/TestBenchFramework/Properties/AssemblyInfo.cs
+++ b/TestBenchFramework/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.12.423.1")]
-[assembly: AssemblyFileVersion("2.12.423.1")]
+[assembly: AssemblyVersion("2.12.424.1")]
+[assembly: AssemblyFileVersion("2.12.424.1")]