diff --git a/Packages/ohif-core/client/lib/index.js b/Packages/ohif-core/client/lib/index.js
index 01579a5b0..cd12ec3bc 100644
--- a/Packages/ohif-core/client/lib/index.js
+++ b/Packages/ohif-core/client/lib/index.js
@@ -3,6 +3,5 @@ import './cornerstone.js';
 import './object.js';
 import './string.js';
 import './ui.js';
-import './user.js';
 import './utils.js';
 import './viewer.js';
diff --git a/Packages/ohif-core/server/index.js b/Packages/ohif-core/server/index.js
index b3741506a..a115d2acd 100644
--- a/Packages/ohif-core/server/index.js
+++ b/Packages/ohif-core/server/index.js
@@ -1,2 +1 @@
 import './mongo.js';
-import './user.js';
diff --git a/Packages/ohif-core/client/lib/user.js b/Packages/ohif-user/client/lib/data.js
similarity index 89%
rename from Packages/ohif-core/client/lib/user.js
rename to Packages/ohif-user/client/lib/data.js
index bc2cb81d8..3a5748442 100644
--- a/Packages/ohif-core/client/lib/user.js
+++ b/Packages/ohif-user/client/lib/data.js
@@ -1,7 +1,6 @@
+import { Meteor } from 'meteor/meteor';
 import { OHIF } from 'meteor/ohif:core';
 
-OHIF.user = {};
-
 // Throw error if there is no user logged in
 OHIF.user.validate = () => {
     if (!Meteor.userId()) {
@@ -31,5 +30,5 @@ OHIF.user.setData = (key, value) => {
     OHIF.user.validate();
 
     // Call the update method on server-side
-    Meteor.call('userDataSet', key, value);
+    Meteor.call('ohif.user.data.set', key, value);
 };
diff --git a/Packages/ohif-user/client/lib/index.js b/Packages/ohif-user/client/lib/index.js
index 806d48a0b..3853e390c 100644
--- a/Packages/ohif-user/client/lib/index.js
+++ b/Packages/ohif-user/client/lib/index.js
@@ -1,3 +1,4 @@
+import './data';
 import './getName';
 import './login';
 import './logout';
diff --git a/Packages/ohif-user/package.js b/Packages/ohif-user/package.js
index 1f9ba0fb3..eef10b357 100644
--- a/Packages/ohif-user/package.js
+++ b/Packages/ohif-user/package.js
@@ -28,6 +28,9 @@ Package.onUse(function(api) {
     // Main module
     api.mainModule('main.js', ['client', 'server']);
 
+    // Server imports
+    api.addFiles('server/index.js', 'server');
+
     // Client imports
     api.addFiles('client/index.js', 'client');
 });
diff --git a/Packages/ohif-user/server/index.js b/Packages/ohif-user/server/index.js
new file mode 100644
index 000000000..23ee47934
--- /dev/null
+++ b/Packages/ohif-user/server/index.js
@@ -0,0 +1 @@
+import './user.js';
diff --git a/Packages/ohif-core/server/user.js b/Packages/ohif-user/server/user.js
similarity index 77%
rename from Packages/ohif-core/server/user.js
rename to Packages/ohif-user/server/user.js
index c18bb7e41..3f11d7f16 100644
--- a/Packages/ohif-core/server/user.js
+++ b/Packages/ohif-user/server/user.js
@@ -1,5 +1,6 @@
-import { OHIF } from 'meteor/ohif:core';
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
+import { OHIF } from 'meteor/ohif:core';
 
 // Manipulate user's persistent data
 class UserData {
@@ -24,19 +25,13 @@ class UserData {
         OHIF.MongoUtils.validateUser();
 
         // Build the query to update only the current user's data
-        var query = {
-            _id: Meteor.userId()
-        };
+        const query = { _id: Meteor.userId() };
 
         // Build the path to the persistent data with the given key
         const persistentPath = `profile.persistent.${key}`;
 
         // Build the data to be updated
-        var data = {
-            $set: {
-                [persistentPath]: value
-            }
-        };
+        const data = { $set: { [persistentPath]: value } };
 
         // Update the user's profile data with the persistent information
         Accounts.users.update(query, data, OHIF.MongoUtils.writeCallback);
@@ -46,9 +41,6 @@ class UserData {
 
 // Register the methods
 Meteor.methods({
-    userDataGet: key => UserData.get(key),
-    userDataSet: (key, value) => UserData.set(key, value)
+    'ohif.user.data.get': key => UserData.get(key),
+    'ohif.user.data.set': (key, value) => UserData.set(key, value)
 });
-
-// Expose the class in the OHIF object
-OHIF.UserData = UserData;