diff --git a/doc/dbus/bus/org.opensuse.Agama1.ServiceStatus.bus.xml b/doc/dbus/bus/org.opensuse.Agama1.ServiceStatus.bus.xml
deleted file mode 120000
index 30d354ffd2..0000000000
--- a/doc/dbus/bus/org.opensuse.Agama1.ServiceStatus.bus.xml
+++ /dev/null
@@ -1 +0,0 @@
-org.opensuse.Agama.Users1.bus.xml
\ No newline at end of file
diff --git a/doc/dbus/org.opensuse.Agama1.ServiceStatus.doc.xml b/doc/dbus/org.opensuse.Agama1.ServiceStatus.doc.xml
deleted file mode 100644
index 10840ebefc..0000000000
--- a/doc/dbus/org.opensuse.Agama1.ServiceStatus.doc.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node name="/org/opensuse/Agama/Users1">
-  <!--
-      org.opensuse.Agama1.ServiceStatus:
-
-Each service will have an status (*idle* or *busy*). The service should change its status to *busy*
-when it is going to start an expensive tasks. The status should be set back to *idle* once the long
-task is done.
-
-The main object of a service implements the following interface:
-  -->
-  <interface name="org.opensuse.Agama1.ServiceStatus">
-    <!--
-        All:
-
-        All possible statuses:
-
-<programlisting>
-[
-    {"id" => 0, "label" => "idle"},
-    {"id" => 1, "label" => "busy"}
-]
-</programlisting>
-    -->
-    <property type="aa{sv}" name="All" access="read"/>
-
-    <!--
-        Current:
-
-        Id of the current status.
-    -->
-    <property type="u" name="Current" access="read"/>
-  </interface>
-</node>
diff --git a/service/lib/agama/dbus/manager_service.rb b/service/lib/agama/dbus/manager_service.rb
index 6351ef4031..7a9c9bf432 100644
--- a/service/lib/agama/dbus/manager_service.rb
+++ b/service/lib/agama/dbus/manager_service.rb
@@ -125,7 +125,7 @@ def manager_dbus
       end
 
       def users_dbus
-        @users_dbus ||= Agama::DBus::Users.new(users, logger)
+        @users_dbus ||= Agama::DBus::Users.new(manager.users, logger)
       end
     end
   end
diff --git a/service/lib/agama/users.rb b/service/lib/agama/users.rb
index dd464a20c6..080ee30632 100644
--- a/service/lib/agama/users.rb
+++ b/service/lib/agama/users.rb
@@ -149,7 +149,7 @@ def update_issues
       unless root_password? || root_ssh_key? || first_user?
         new_issues << Issue.new(
           _("Defining a user, setting the root password or a SSH public key is required"),
-          source: Issue::Source::CONFIG,
+          source:   Issue::Source::CONFIG,
           severity: Issue::Severity::ERROR
         )
       end