diff --git a/src/Database.T4/Properties/AssemblyInfo.cs b/src/Database.T4/Properties/AssemblyInfo.cs
index 0f435acb39bf3ee9a67116e034ec5554d3e8f1b9..b7c9c5e1c1c90f80b3ceb64ed238da361871970b 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-apito0001")]
+[assembly: AssemblyInformationalVersion("1.26.0-topic-1125-apito0002")]
 [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 431fdbb6c339a7352167c77f78b96854992ed47b..38dd23f0335107448ffc012e78f8e5caf91a62a2 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-apito0001")]
+[assembly: AssemblyInformationalVersion("1.26.0-topic-1125-apito0002")]
 [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
 
diff --git a/src/Database/Models/ApiTokenModel.cs b/src/Database/Models/ApiTokenModel.cs
index 2ce337503884a6a94315081abd576227429a848b..64d44db3c6b21bd1d21a1c6d5226348e357769a0 100644
--- a/src/Database/Models/ApiTokenModel.cs
+++ b/src/Database/Models/ApiTokenModel.cs
@@ -44,7 +44,11 @@ namespace Coscine.Database.Models
 
         public ApiTokenObject GetToken(string userId, string token)
         {
-            var t = GetWhere(x => x.Token.ToLower() == token.ToLower() && x.UserId.ToString() == userId);
+            var t = GetWhere(x => x.UserId.ToString() == userId && x.Token == token);
+            if(t == null)
+            {
+                return null;
+            }
             return new ApiTokenObject { Created = t.Creation, Expires = t.Expiration, Token = t.Token, Description = t.Description };
         }
 
diff --git a/src/Database/Properties/AssemblyInfo.cs b/src/Database/Properties/AssemblyInfo.cs
index 3a1b2d25f7abf7bf26d7b7b51d52a2009f71f644..860be165eb385bd7fd207613af59e34ac4cdad0f 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-apito0001")]
+[assembly: AssemblyInformationalVersion("1.26.0-topic-1125-apito0002")]
 [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]