diff --git a/src/odbc/mssql2000.sql b/src/odbc/mssql2000.sql
index da38f5076..83085a8f1 100644
--- a/src/odbc/mssql2000.sql
+++ b/src/odbc/mssql2000.sql
@@ -600,6 +600,40 @@ BEGIN
 END
 GO
 
+/******************************************************************/
+/****** Object:  StoredProcedure [dbo].[set_roster_version]      **/
+/** Update users roster_version                                  **/
+/******************************************************************/
+CREATE PROCEDURE [dbo].[set_roster_version]
+  @Username varchar(200), 
+  @Version varchar(50)
+AS
+BEGIN
+  IF EXISTS (SELECT username FROM roster_version WITH (NOLOCK) WHERE username=@Username)
+    BEGIN
+      UPDATE roster_version SET username=@Username, version=@Version WHERE username=@Username;
+    END
+  ELSE
+    BEGIN
+      INSERT INTO roster_version (username, version) VALUES (@Username, @Version);
+    END
+END
+GO
+
+/******************************************************************/
+/****** Object:  StoredProcedure [dbo].[get_roster_version]      **/
+/** Retrive the user roster_version                              **/
+/******************************************************************/
+CREATE PROCEDURE [dbo].[get_roster_version]
+  @Username varchar(200)
+AS
+BEGIN
+  SELECT roster_version.version as version 
+  FROM roster_version WITH (NOLOCK)
+  WHERE username=@Username;
+END
+GO
+
 /***************************************************************/
 /****** Object:  StoredProcedure [dbo].[clean_spool_msg]  ******/
 /** Delete messages older that 3 days from spool              **/
diff --git a/src/odbc/mssql2005.sql b/src/odbc/mssql2005.sql
index b9053d89e..1fdbd7883 100644
--- a/src/odbc/mssql2005.sql
+++ b/src/odbc/mssql2005.sql
@@ -923,6 +923,40 @@ BEGIN
 END
 GO
 
+/******************************************************************/
+/****** Object:  StoredProcedure [dbo].[set_roster_version]      **/
+/** Update users roster_version                                  **/
+/******************************************************************/
+CREATE PROCEDURE [dbo].[set_roster_version]
+  @Username varchar(200),
+  @Version varchar(8000)
+AS
+BEGIN
+  IF EXISTS (SELECT username FROM roster_version WITH (NOLOCK) WHERE username=@Username)
+    BEGIN
+      UPDATE roster_version SET username=@Username, version=@Version WHERE username=@Username;
+    END
+  ELSE
+    BEGIN
+      INSERT INTO roster_version (username, version) VALUES (@Username, @Version);
+    END
+END
+GO
+
+/******************************************************************/
+/****** Object:  StoredProcedure [dbo].[get_roster_version]      **/
+/** Retrive the user roster_version                              **/
+/******************************************************************/
+CREATE PROCEDURE [dbo].[get_roster_version]
+  @Username varchar(200)
+AS
+BEGIN
+  SELECT roster_version.version as version
+  FROM roster_version WITH (NOLOCK)
+  WHERE username=@Username;
+END
+GO
+
 /***************************************************************/
 /****** Object:  StoredProcedure [dbo].[clean_spool_msg]  ******/
 /** Delete messages older that 3 days from spool              **/
diff --git a/src/odbc/odbc_queries.erl b/src/odbc/odbc_queries.erl
index a9f4055c9..ccbf8271d 100644
--- a/src/odbc/odbc_queries.erl
+++ b/src/odbc/odbc_queries.erl
@@ -92,6 +92,8 @@
 -define(generic, true).
 -endif.
 
+-include("ejabberd.hrl").
+
 %% -----------------
 %% Generic queries
 -ifdef(generic).
@@ -909,8 +911,14 @@ count_records_where(LServer, Table, WhereClause) ->
       ["select count(*) from ", Table, " with (nolock) ", WhereClause]).
 
 get_roster_version(LServer, LUser) ->
-	ejabberd_odbc:sql_query(LServer, 
-		["select version from dbo.roster_version with (nolock) where username = '", LUser, "'"]).
-set_roster_version(LUser, Version) ->
-	update_t("dbo.roster_version", ["username", "version"], [LUser, Version], ["username = '", LUser, "'"]).
+    ejabberd_odbc:sql_query(
+      LServer,
+      ["EXECUTE dbo.get_roster_version '", LUser, "'"]).
+
+set_roster_version(Username, Version) ->
+    %% This function doesn't know the vhost, so we hope it's the first one defined:
+    LServer = ?MYNAME,
+    ejabberd_odbc:sql_query(
+      LServer,
+      ["EXECUTE dbo.set_roster_version '", Username, "', '", Version, "'"]).
 -endif.