diff --git a/repository/src/main/java/org/apache/atlas/discovery/AtlasAuthorization.java b/repository/src/main/java/org/apache/atlas/discovery/AtlasAuthorization.java
index 3e55a884ad..0c04df1ab2 100644
--- a/repository/src/main/java/org/apache/atlas/discovery/AtlasAuthorization.java
+++ b/repository/src/main/java/org/apache/atlas/discovery/AtlasAuthorization.java
@@ -301,7 +301,10 @@ private static boolean validateResourcesForCreateEntity(List<RangerPolicy> resou
 
                     if ("entity".equals(resource)) {
                         String assetQualifiedName = (String) entity.getAttribute(QUALIFIED_NAME);
-                        Optional<String> match = values.stream().filter(x -> assetQualifiedName.matches(x.replace("*", ".*"))).findFirst();
+                        Optional<String> match = values.stream().filter(x -> assetQualifiedName.matches(x
+                                .replace("{USER}", getCurrentUserName())
+                                .replace("*", ".*")))
+                                .findFirst();
 
                         if (!match.isPresent()) {
                             resourcesMatched = false;
diff --git a/webapp/src/main/java/org/apache/atlas/web/rest/EntityREST.java b/webapp/src/main/java/org/apache/atlas/web/rest/EntityREST.java
index b63398b422..b218ef4f07 100644
--- a/webapp/src/main/java/org/apache/atlas/web/rest/EntityREST.java
+++ b/webapp/src/main/java/org/apache/atlas/web/rest/EntityREST.java
@@ -172,7 +172,11 @@ public List<AtlasEvaluatePolicyResponse> evaluatePolicies(List<AtlasEvaluatePoli
                         AtlasEntityAccessRequest entityAccessRequest = requestBuilder.build();
 
 //                        AtlasAuthorizationUtils.verifyAccess(entityAccessRequest, entities.get(i).getAction() + "guid=" + entities.get(i).getEntityGuid());
-                        verifyAccess(entities.get(i).getEntityGuid(), AtlasPrivilege.valueOf(entities.get(i).getAction()).getType());
+                        if (ENTITY_CREATE.name().equals(action)) {
+                            verifyAccess(new AtlasEntity(entityHeader), ENTITY_CREATE, "create entity: type=" +  entityHeader.getTypeName());
+                        } else {
+                            verifyAccess(entities.get(i).getEntityGuid(), AtlasPrivilege.valueOf(entities.get(i).getAction()).getType());
+                        }
                         response.add(new AtlasEvaluatePolicyResponse(entities.get(i).getTypeName(), entities.get(i).getEntityGuid(), entities.get(i).getAction(), entities.get(i).getEntityId(), true, null , entities.get(i).getBusinessMetadata()));
                     } catch (AtlasBaseException e) {
                         AtlasErrorCode code = e.getAtlasErrorCode();