diff --git a/plugins/UserAgreement/UserAgreement.py b/plugins/UserAgreement/UserAgreement.py
index 30b2c00f08..4ea1ccf9bb 100644
--- a/plugins/UserAgreement/UserAgreement.py
+++ b/plugins/UserAgreement/UserAgreement.py
@@ -1,27 +1,26 @@
 # Copyright (c) 2017 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
-from UM.Extension import Extension
-from UM.Application import Application
-from UM.PluginRegistry import PluginRegistry
-from UM.Logger import Logger
-
-from cura.CuraApplication import CuraApplication
+import os
 
 from PyQt5.QtCore import QObject, pyqtSlot
 
-import os.path
+from UM.Extension import Extension
+from UM.Logger import Logger
+
 
 class UserAgreement(QObject, Extension):
-    def __init__(self):
+    def __init__(self, application):
         super(UserAgreement, self).__init__()
+        self._application = application
         self._user_agreement_window = None
         self._user_agreement_context = None
-        Application.getInstance().engineCreatedSignal.connect(self._onEngineCreated)
-        Application.getInstance().getPreferences().addPreference("general/accepted_user_agreement", False)
+        self._application.engineCreatedSignal.connect(self._onEngineCreated)
+
+        self._application.getPreferences().addPreference("general/accepted_user_agreement", False)
 
     def _onEngineCreated(self):
-        if not Application.getInstance().getPreferences().getValue("general/accepted_user_agreement"):
+        if not self._application.getPreferences().getValue("general/accepted_user_agreement"):
             self.showUserAgreement()
 
     def showUserAgreement(self):
@@ -34,14 +33,14 @@ class UserAgreement(QObject, Extension):
     def didAgree(self, user_choice):
         if user_choice:
             Logger.log("i", "User agreed to the user agreement")
-            Application.getInstance().getPreferences().setValue("general/accepted_user_agreement", True)
+            self._application.getPreferences().setValue("general/accepted_user_agreement", True)
             self._user_agreement_window.hide()
         else:
             Logger.log("i", "User did NOT agree to the user agreement")
-            Application.getInstance().getPreferences().setValue("general/accepted_user_agreement", False)
-            CuraApplication.getInstance().quit()
-        CuraApplication.getInstance().setNeedToShowUserAgreement(False)
+            self._application.getPreferences().setValue("general/accepted_user_agreement", False)
+            self._application.quit()
+        self._application.setNeedToShowUserAgreement(False)
 
     def createUserAgreementWindow(self):
-        path = os.path.join(PluginRegistry.getInstance().getPluginPath(self.getPluginId()), "UserAgreement.qml")
-        self._user_agreement_window = Application.getInstance().createQmlComponent(path, {"manager": self})
+        path = os.path.join(self._application.getPluginRegistry().getPluginPath(self.getPluginId()), "UserAgreement.qml")
+        self._user_agreement_window = self._application.createQmlComponent(path, {"manager": self})
diff --git a/plugins/UserAgreement/__init__.py b/plugins/UserAgreement/__init__.py
index 88cb151f9e..3cf81c64f4 100644
--- a/plugins/UserAgreement/__init__.py
+++ b/plugins/UserAgreement/__init__.py
@@ -7,4 +7,4 @@ def getMetaData():
     return {}
 
 def register(app):
-    return {"extension": UserAgreement.UserAgreement()}
+    return {"extension": UserAgreement.UserAgreement(app)}