diff --git a/include/AuthManager.h b/include/AuthManager.h
index 86d33badd5..b153bd04fe 100644
--- a/include/AuthManager.h
+++ b/include/AuthManager.h
@@ -259,7 +259,8 @@ public:
         timeout(false),
         auth_driver(_auth_driver),
         uid(_uid),
-        time_out(0)
+        time_out(0),
+        self_authorize(true)
     {
         am.addListener(this);
     };
@@ -309,7 +310,8 @@ public:
      *    @param ob the object over which the operation will be performed
      *    @param ob_id the object unique id
      *    @param op the operation to be authorized
-     *    @param owner id of user that owns the object
+     *    @param owner id of user that owns the object. For creates MUST equals
+          uid, hosts owner is uid=0
      *    @param pub public attribute
      */
     void add_auth(Object        ob,
@@ -319,6 +321,7 @@ public:
                   bool          pub)
     {
         ostringstream oss;
+        bool          auth = owner == uid;
 
         switch (ob)
         {
@@ -332,14 +335,31 @@ public:
 
         switch (op)
         {
-            case CREATE: oss << "CREATE:" ; break;
-            case DELETE: oss << "DELETE:" ; break;
-            case USE:    oss << "USE:" ; break;
-            case MANAGE: oss << "MANAGE:" ; break;
+            case CREATE:
+                oss << "CREATE:" ;
+                break;
+
+            case DELETE:
+                oss << "DELETE:" ;
+                break;
+
+            case USE:
+                oss << "USE:" ;
+                if ( ob == NET || ob == IMAGE )
+                {
+                    auth = auth || (pub == true);
+                }
+                break;
+
+            case MANAGE:
+                oss << "MANAGE:" ;
+                break;
         }
 
         oss << owner << ":" << pub;
 
+        self_authorize = self_authorize && auth;
+
         auths.push_back(oss.str());
     };
 
@@ -392,6 +412,16 @@ public:
         am.loop(0,0);
     };
 
+    bool plain_authorize()
+    {
+        return ( uid == 0 || self_authorize );
+    }
+
+    bool plain_authenticate()
+    {
+        return (password == session);
+    }
+
     /**
      *  The result of the request, true if authorized or authenticated
      */
@@ -456,6 +486,11 @@ private:
      */
     vector<string> auths;
 
+    /**
+     *  Plain authorization for the request
+     */
+    bool self_authorize;
+
     /**
      *  No actions defined for the Auth request, just FINALIZE when done
      */
diff --git a/src/authm/test/AuthManagerTest.cc b/src/authm/test/AuthManagerTest.cc
index 5fbdfb8bce..e7897225ed 100644
--- a/src/authm/test/AuthManagerTest.cc
+++ b/src/authm/test/AuthManagerTest.cc
@@ -45,6 +45,8 @@ class AuthManagerTest : public CppUnit::TestFixture
     //CPPUNIT_TEST (timeout);
     CPPUNIT_TEST (authenticate);
     CPPUNIT_TEST (authorize);
+    CPPUNIT_TEST (self_authorize);
+    CPPUNIT_TEST (self_authenticate);
 
     CPPUNIT_TEST_SUITE_END ();
 
@@ -211,6 +213,58 @@ public:
 
         CPPUNIT_ASSERT(0==0);
     }
+
+
+    void self_authorize()
+    {
+        AuthRequest ar(2,"dummy");
+        AuthRequest ar1(2,"dummy");
+        AuthRequest ar2(3,"dummy");
+        AuthRequest ar3(4,"dummy");
+        AuthRequest ar4(2,"dummy");
+        AuthRequest ar5(0,"dummy");
+        AuthRequest ar6(0,"dummy");
+
+        ar.add_auth(AuthRequest::VM,"dGhpcy",AuthRequest::CREATE,2,false);
+        ar.add_auth(AuthRequest::NET,2,AuthRequest::USE,2,false);
+        ar.add_auth(AuthRequest::IMAGE,3,AuthRequest::USE,4,true);
+
+        CPPUNIT_ASSERT(ar.plain_authorize() == true);
+
+        ar1.add_auth(AuthRequest::VM,"dGhpcy",AuthRequest::CREATE,2,false);
+        ar1.add_auth(AuthRequest::NET,2,AuthRequest::USE,2,false);
+        ar1.add_auth(AuthRequest::IMAGE,3,AuthRequest::USE,4,false);
+
+        CPPUNIT_ASSERT(ar1.plain_authorize() == false);
+
+        ar2.add_auth(AuthRequest::HOST,"dGhpcy",AuthRequest::CREATE,0,false);
+        CPPUNIT_ASSERT(ar2.plain_authorize() == false);
+
+        ar3.add_auth(AuthRequest::VM,5,AuthRequest::MANAGE,2,false);
+        CPPUNIT_ASSERT(ar3.plain_authorize() == false);
+
+        ar4.add_auth(AuthRequest::VM,4,AuthRequest::MANAGE,2,false);
+        CPPUNIT_ASSERT(ar4.plain_authorize() == true);
+
+        ar5.add_auth(AuthRequest::HOST,4,AuthRequest::MANAGE,0,false);
+        CPPUNIT_ASSERT(ar5.plain_authorize() == true);
+
+        ar6.add_auth(AuthRequest::HOST,4,AuthRequest::CREATE,0,false);
+        CPPUNIT_ASSERT(ar6.plain_authorize() == true);
+    }
+
+    void self_authenticate()
+    {
+        AuthRequest ar(2,"dummy");
+        AuthRequest ar1(2,"dummy");
+
+        ar.add_authenticate("the_user","the_pass","the_secret");
+        CPPUNIT_ASSERT(ar.plain_authenticate() == false);
+
+        ar1.add_authenticate("the_user","the_pass","the_pass");
+        CPPUNIT_ASSERT(ar1.plain_authenticate() == true);
+    }
+
 private:
     AuthManager * am;