diff --git a/src/freedombone-app-peertube b/src/freedombone-app-peertube
index 5d481322..ffa1142f 100755
--- a/src/freedombone-app-peertube
+++ b/src/freedombone-app-peertube
@@ -342,7 +342,7 @@ function remove_peertube {
     sed -i '/peertube/d' $COMPLETION_FILE
 
     function_check drop_database_postgresql
-    drop_database_postgresql peertube
+    drop_database_postgresql peertube peertube
 
     remove_postgresql_user peertube
     groupdel -f peertube
diff --git a/src/freedombone-utils-postgresql b/src/freedombone-utils-postgresql
index c41b6e31..e8be209b 100755
--- a/src/freedombone-utils-postgresql
+++ b/src/freedombone-utils-postgresql
@@ -124,8 +124,12 @@ function remove_postgresql_user {
 
 function drop_database_postgresql {
     database_name="$1"
+    database_owner_name="$2"
     cd /etc/postgresql
     sudo -u postgres psql -c "drop database $database_name"
+    if [ ${#database_owner_name} -gt 0 ]; then
+        sudo -u postgres psql -c "drop user $database_owner_name"
+    fi
 }
 
 function run_system_query_postgresql {