diff --git a/object/organization.go b/object/organization.go
index c2f84fc4..56f4918b 100644
--- a/object/organization.go
+++ b/object/organization.go
@@ -464,7 +464,9 @@ func organizationChangeTrigger(oldName string, newName string) error {
 	record.Organization = newName
 	_, err = session.Where("organization=?", oldName).Update(record)
 	if err != nil {
-		return err
+		if err.Error() != "no columns found to be updated" {
+			return err
+		}
 	}
 
 	resource := new(Resource)
diff --git a/object/user.go b/object/user.go
index 5f503dfd..8bd3cdb5 100644
--- a/object/user.go
+++ b/object/user.go
@@ -1021,6 +1021,10 @@ func userChangeTrigger(oldName string, newName string) error {
 	}
 	for _, permission := range permissions {
 		for j, u := range permission.Users {
+			if u == "*" {
+				continue
+			}
+
 			// u = organization/username
 			owner, name := util.GetOwnerAndNameFromId(u)
 			if name == oldName {