diff --git a/default.ps1 b/default.ps1
index c4ab00645..fd4da76e2 100644
--- a/default.ps1
+++ b/default.ps1
@@ -11,7 +11,7 @@ properties {
 	$nuget_path = "$base_directory\nuget.exe"
 
 	$buildNumber = 0;
-	$version = "2.5.3.0"
+	$version = "2.5.4.0"
 	$preRelease = $null
 }
 
diff --git a/source/Core/Services/Default/DefaultRefreshTokenService.cs b/source/Core/Services/Default/DefaultRefreshTokenService.cs
index b8ad461c7..24703641e 100644
--- a/source/Core/Services/Default/DefaultRefreshTokenService.cs
+++ b/source/Core/Services/Default/DefaultRefreshTokenService.cs
@@ -155,9 +155,8 @@ public virtual async Task<string> UpdateRefreshTokenAsync(string handle, Refresh
             }
 
             await RaiseRefreshTokenRefreshedEventAsync(handle, newHandle, refreshToken);
-            Logger.Debug("No updates to refresh token done");
 
-            return handle;
+            return newHandle;
         }
 
         /// <summary>
diff --git a/source/VersionAssemblyInfo.cs b/source/VersionAssemblyInfo.cs
index a64ba0f8f..bd6ac3c34 100644
Binary files a/source/VersionAssemblyInfo.cs and b/source/VersionAssemblyInfo.cs differ