diff --git a/plugins/Amazon.py b/plugins/Amazon.py
index 4f5de0004..e9487f9ea 100644
--- a/plugins/Amazon.py
+++ b/plugins/Amazon.py
@@ -66,7 +66,7 @@ def configure(advanced):
 class LicenseKey(registry.String):
     def set(self, s):
         # In case we decide we need to recover
-        original = getattr(self, 'value', self.default)
+        original = getattr(self, 'value', self._default)
         registry.String.set(self, s)
         if self.value:
             amazon.setLicense(self.value)
diff --git a/src/conf.py b/src/conf.py
index 9f0953db2..fd994a01c 100644
--- a/src/conf.py
+++ b/src/conf.py
@@ -120,7 +120,7 @@ users.setName('users')
 registerGroup(users, 'plugins')
 
 def registerUserValue(group, name, value):
-    assert group.name.startswith('users')
+    assert group._name.startswith('users')
     value.supplyDefault = True
     group.register(name, value)