diff --git a/src/Routes/RouteRegister.c b/src/Routes/RouteRegister.c
index 5503a1b..7a06791 100644
--- a/src/Routes/RouteRegister.c
+++ b/src/Routes/RouteRegister.c
@@ -52,6 +52,7 @@ ROUTE_IMPL(RouteRegister, args)
     char *deviceId = NULL;
 
     Db *db = args->matrixArgs->db;
+    LogConfig *lc = args->matrixArgs->lc;
 
     User *user = NULL;
 
@@ -207,8 +208,10 @@ ROUTE_IMPL(RouteRegister, args)
         {
             /* TODO: Log in user here and attach auth info to response */
         }
-        UserUnlock(user);
 
+        Log(lc, LOG_INFO, "Registered user '%s'", UserGetName(user));
+
+        UserUnlock(user);
 finish:
         Free(username);
         Free(password);
diff --git a/src/User.c b/src/User.c
index b1e51b6..cfd9ee0 100644
--- a/src/User.c
+++ b/src/User.c
@@ -121,13 +121,19 @@ UserLock(Db * db, char *name)
 int
 UserUnlock(User * user)
 {
+    int ret;
+
     if (!user)
     {
         return 0;
     }
+
     Free(user->name);
+
+    ret = DbUnlock(user->db, user->ref);
     Free(user);
-    return DbUnlock(user->db, user->ref);
+
+    return ret;
 }
 
 User *