diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/001-create-schema.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/001-create-schema.sql
index 92525dd02..95382efdc 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/001-create-schema.sql
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/001-create-schema.sql
@@ -17,12 +17,6 @@
  * under the License.
  */
 
-/**
- * Create the guacamole schema.
- */
-CREATE SCHEMA [dbo]
-GO
-
 /**
  * List for permission data type.
  */
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/002-create-admin-user.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/002-create-admin-user.sql
index 408d7cafd..c6e6d9b6a 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/002-create-admin-user.sql
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/002-create-admin-user.sql
@@ -33,7 +33,7 @@ FROM (
     JOIN [dbo].[guacamole_user] ON permissions.username = [dbo].[guacamole_user].[username]
     JOIN [dbo].[guacamole_user] affected ON permissions.affected_username = affected.username;
 
-INSERT INTO [dbo].[system_permission]
+INSERT INTO [dbo].[guacamole_system_permission]
 SELECT user_id, permission
 FROM (
     SELECT 'guacadmin' AS username, 'CREATE_CONNECTION' AS permission