diff --git a/src/api/newuser_args.rs b/src/api/newuser_args.rs
index 047a4bb..b4c0c6a 100644
--- a/src/api/newuser_args.rs
+++ b/src/api/newuser_args.rs
@@ -1,20 +1,21 @@
 use std::path::PathBuf;
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub enum DeleteHome {
     Delete,
     Keep,
     Archive { path: PathBuf },
 }
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub enum DeletePrimaryGroup {
     Delete,
     Keep,
     DeleteIfEmpty,
 }
 
-#[derive(Debug, Builder)]
+#[derive(Debug, Builder, Eq, PartialEq)]
 #[builder(public)]
+#[builder(default)]
 pub struct NewUserArgs<'a> {
     pub username: &'a str,
     pub delete_home: DeleteHome,
diff --git a/src/bin/delete_user.rs b/src/bin/delete_user.rs
index 3d81c43..7a666ff 100644
--- a/src/bin/delete_user.rs
+++ b/src/bin/delete_user.rs
@@ -23,6 +23,7 @@ fn main() {
     let user_res: Result<adduser::User, adduser::UserLibError> = db.delete_user(
         adduser::api::NewUserArgs::builder()
             .username("teste")
+            // .delete_home(adduser::api::DeleteHome::Delete)
             .build()
             .unwrap(),
     );
diff --git a/src/error.rs b/src/error.rs
index f809601..eec9b9d 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -85,6 +85,12 @@ impl From<String> for UserLibError {
     }
 }
 
+impl From<std::io::Error> for UserLibError {
+    fn from(e: std::io::Error) -> Self {
+        UserLibError::Message(MyMessage::Simple(e.to_string()))
+    }
+}
+
 impl From<(String, std::io::Error)> for UserLibError {
     fn from((m, e): (String, std::io::Error)) -> Self {
         UserLibError::Message(MyMessage::IOError(m, e))
diff --git a/src/userlib/mod.rs b/src/userlib/mod.rs
index d2462eb..67d530d 100644
--- a/src/userlib/mod.rs
+++ b/src/userlib/mod.rs
@@ -132,6 +132,19 @@ impl UserDBLocal {
         }
     }
 
+    fn delete_home(user: &crate::User) -> std::io::Result<()> {
+        match user.get_home_dir() {
+            Some(dir) => std::fs::remove_dir_all(dir),
+            None => {
+                error!("Failed to remove the home directory! As the user did not have one.");
+                Err(std::io::Error::new(
+                    std::io::ErrorKind::InvalidInput,
+                    "Failed to remove the home directory! As the user did not have one.",
+                ))
+            }
+        }
+    }
+
     fn get_group_pos_by_id(&self, id: u32) -> Option<(&crate::Group, usize)> {
         for (i, group) in self.groups.iter().enumerate() {
             if group.get_gid()? == id {
@@ -142,9 +155,9 @@ impl UserDBLocal {
     }
 }
 
-use crate::api::UserDBWrite;
+use crate::api::{DeleteHome, DeletePrimaryGroup, NewUserArgs, UserDBRead, UserDBWrite};
 impl UserDBWrite for UserDBLocal {
-    fn delete_user(&mut self, args: crate::api::NewUserArgs) -> Result<crate::User, UserLibError> {
+    fn delete_user(&mut self, args: NewUserArgs) -> Result<crate::User, UserLibError> {
         // try to get the user from the database
         let user_opt = self.get_user_by_name(args.username);
         let user = match user_opt {
@@ -179,6 +192,9 @@ impl UserDBWrite for UserDBLocal {
             } else {
                 UserDBLocal::delete_from_passwd(user, passwd_file_content, &mut locked_p)?;
                 UserDBLocal::delete_from_shadow(user, shadow_file_content, &mut locked_s)?;
+                if args.delete_home == DeleteHome::Delete {
+                    UserDBLocal::delete_home(user)?;
+                }
                 let group = self.get_group_pos_by_id(user.get_gid());
                 match group {
                     Some((group, id)) => {
@@ -268,7 +284,6 @@ impl UserDBWrite for UserDBLocal {
     }
 }
 
-use crate::api::UserDBRead;
 impl UserDBRead for UserDBLocal {
     fn get_all_users(&self) -> Vec<&crate::User> {
         let mut res: Vec<&crate::User> = self.users.iter().map(|(_, x)| x).collect();