diff --git a/models/org.go b/models/org.go
index a62c67deb..1cc25231e 100644
--- a/models/org.go
+++ b/models/org.go
@@ -182,10 +182,6 @@ func CreateOrganization(org, owner *User) (err error) {
 		return fmt.Errorf("insert team-user relation: %v", err)
 	}
 
-	if err = os.MkdirAll(UserPath(org.Name), os.ModePerm); err != nil {
-		return fmt.Errorf("create directory: %v", err)
-	}
-
 	return sess.Commit()
 }
 
diff --git a/models/user.go b/models/user.go
index a68b23568..11cbdb2f4 100644
--- a/models/user.go
+++ b/models/user.go
@@ -798,8 +798,6 @@ func CreateUser(u *User) (err error) {
 
 	if _, err = sess.Insert(u); err != nil {
 		return err
-	} else if err = os.MkdirAll(UserPath(u.Name), os.ModePerm); err != nil {
-		return err
 	}
 
 	return sess.Commit()
@@ -898,7 +896,12 @@ func ChangeUserName(u *User, newUserName string) (err error) {
 		return fmt.Errorf("Delete repository wiki local copy: %v", err)
 	}
 
-	return os.Rename(UserPath(u.Name), UserPath(newUserName))
+	// Do not fail if directory does not exist
+	if err = os.Rename(UserPath(u.Name), UserPath(newUserName)); err != nil && !os.IsNotExist(err) {
+		return fmt.Errorf("Rename user directory: %v", err)
+	}
+
+	return nil
 }
 
 // checkDupEmail checks whether there are the same email with the user