diff --git a/src/cloud/common/CloudAuth/EC2CloudAuth.rb b/src/cloud/common/CloudAuth/EC2CloudAuth.rb
index 9f76421023..8bae4cd704 100644
--- a/src/cloud/common/CloudAuth/EC2CloudAuth.rb
+++ b/src/cloud/common/CloudAuth/EC2CloudAuth.rb
@@ -17,7 +17,7 @@
 module EC2CloudAuth
     def do_auth(env, params={})
         username = params['AWSAccessKeyId']
-        one_pass = get_password(username, 'core')
+        one_pass = get_password(username,  'core|public')
         return nil unless one_pass
 
         signature = case params['SignatureVersion']
diff --git a/src/cloud/common/CloudAuth/OCCICloudAuth.rb b/src/cloud/common/CloudAuth/OCCICloudAuth.rb
index 5dff6ec0f7..8ad6fa07a6 100644
--- a/src/cloud/common/CloudAuth/OCCICloudAuth.rb
+++ b/src/cloud/common/CloudAuth/OCCICloudAuth.rb
@@ -21,7 +21,7 @@ module OCCICloudAuth
         if auth.provided? && auth.basic?
             username, password = auth.credentials
 
-            one_pass = get_password(username, 'core')
+            one_pass = get_password(username, 'core|public')
 
             if one_pass && one_pass == password
                 return username