diff --git a/include/Nebula.h b/include/Nebula.h
index f488dc04f1..56269cc070 100644
--- a/include/Nebula.h
+++ b/include/Nebula.h
@@ -356,23 +356,6 @@ public:
         return nebula_configuration->to_xml(xml);
     };
 
-    int get_default_umask() const
-    {
-        string umask_st;
-        int umask;
-
-        istringstream iss;
-
-        get_configuration_attribute(
-                "DEFAULT_UMASK", umask_st);
-
-        iss.str(umask_st);
-
-        iss >> oct >> umask;
-
-        return umask;
-    };
-
     // -----------------------------------------------------------------------
     // Default Quotas
     // -----------------------------------------------------------------------
diff --git a/src/um/User.cc b/src/um/User.cc
index 651c2dce2b..91e7033d35 100644
--- a/src/um/User.cc
+++ b/src/um/User.cc
@@ -197,8 +197,8 @@ int User::from_xml(const string& xml)
     rc += obj_template->from_xml_node(content[0]);
 
     ObjectXML::free_nodes(content);
-   
-    rc += quota.from_xml(this); 
+
+    rc += quota.from_xml(this);
 
     if (rc != 0)
     {
@@ -298,14 +298,14 @@ int User::get_umask() const
 
     if(umask_st.empty())
     {
-        return Nebula::instance().get_default_umask();
+        Nebula::instance().get_configuration_attribute("DEFAULT_UMASK",umask_st);
     }
 
     iss.str(umask_st);
 
     iss >> oct >> umask;
 
-    return umask;
+    return (umask & 0777);
 }
 
 /* -------------------------------------------------------------------------- */