diff --git a/src/Database.T4/Properties/AssemblyInfo.cs b/src/Database.T4/Properties/AssemblyInfo.cs
index 2b083c651e05344bdc73a2cccb797a5fba29e0d0..9a9185b8fc978ab0a0afca4aca395e4b82dd4566 100644
--- a/src/Database.T4/Properties/AssemblyInfo.cs
+++ b/src/Database.T4/Properties/AssemblyInfo.cs
@@ -11,6 +11,6 @@ using System.Reflection;
 [assembly: AssemblyProduct("Database.T4")]
 [assembly: AssemblyVersion("1.26.0")]
 [assembly: AssemblyFileVersion("1.26.0")]
-[assembly: AssemblyInformationalVersion("1.26.0-topic-1125-apito0003")]
+[assembly: AssemblyInformationalVersion("1.26.0-topic-1125-apito0004")]
 [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
 
diff --git a/src/Database.Tests/Properties/AssemblyInfo.cs b/src/Database.Tests/Properties/AssemblyInfo.cs
index 762e170eb00371c9eae37b200256d463c0102c65..a3c742952ecc8703a20eb11fe5cd800f0fa9967c 100644
--- a/src/Database.Tests/Properties/AssemblyInfo.cs
+++ b/src/Database.Tests/Properties/AssemblyInfo.cs
@@ -11,6 +11,6 @@ using System.Reflection;
 [assembly: AssemblyProduct("Database.Tests")]
 [assembly: AssemblyVersion("1.26.0")]
 [assembly: AssemblyFileVersion("1.26.0")]
-[assembly: AssemblyInformationalVersion("1.26.0-topic-1125-apito0003")]
+[assembly: AssemblyInformationalVersion("1.26.0-topic-1125-apito0004")]
 [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
 
diff --git a/src/Database/Models/ApiTokenModel.cs b/src/Database/Models/ApiTokenModel.cs
index 4b6ae1fe73b1b63071260517992c42b850cdf21f..0f776d6a79e97214c9e18ccbf502b546993e548a 100644
--- a/src/Database/Models/ApiTokenModel.cs
+++ b/src/Database/Models/ApiTokenModel.cs
@@ -44,8 +44,13 @@ namespace Coscine.Database.Models
 
         public ApiTokenObject GetToken(string userId, string token)
         {
-            var t = GetWhere(x => x.UserId.ToString() == userId && x.Token.ToLower() == token.ToLower());
-            if(t == null)
+            return GetToken(new Guid(userId), token);
+        }
+
+        public ApiTokenObject GetToken(Guid userId, string token)
+        {
+            var t = GetWhere(x => x.UserId == userId && x.Token.ToLower() == token.ToLower());
+            if (t == null)
             {
                 return null;
             }
diff --git a/src/Database/Properties/AssemblyInfo.cs b/src/Database/Properties/AssemblyInfo.cs
index 356b2232be3586b5c6678c9c2c434a0a4a8affae..1493261b50176b6c1ace355bd9fa548d2adffe16 100644
--- a/src/Database/Properties/AssemblyInfo.cs
+++ b/src/Database/Properties/AssemblyInfo.cs
@@ -11,6 +11,6 @@ using System.Reflection;
 [assembly: AssemblyProduct("Database")]
 [assembly: AssemblyVersion("1.26.0")]
 [assembly: AssemblyFileVersion("1.26.0")]
-[assembly: AssemblyInformationalVersion("1.26.0-topic-1125-apito0003")]
+[assembly: AssemblyInformationalVersion("1.26.0-topic-1125-apito0004")]
 [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]