diff --git a/models/error.go b/models/error.go
index 74551ad8f7997..89d5d29bed666 100644
--- a/models/error.go
+++ b/models/error.go
@@ -66,6 +66,7 @@ type ErrUserNotExist struct {
 	UID   int64
 	Name  string
 	KeyID int64
+	Type  UserType
 }
 
 // IsErrUserNotExist checks if an error is a ErrUserNotExist.
@@ -75,7 +76,7 @@ func IsErrUserNotExist(err error) bool {
 }
 
 func (err ErrUserNotExist) Error() string {
-	return fmt.Sprintf("user does not exist [uid: %d, name: %s, keyid: %d]", err.UID, err.Name, err.KeyID)
+	return fmt.Sprintf("user does not exist [uid: %d, name: %s, keyid: %d, type: %d]", err.UID, err.Name, err.KeyID, err.Type)
 }
 
 // ErrEmailAlreadyUsed represents a "EmailAlreadyUsed" kind of error.
@@ -448,22 +449,6 @@ func (err ErrAccessTokenEmpty) Error() string {
 // \_______  /__|  \___  (____  /___|  /__/_____ \(____  /__| |__|\____/|___|  /
 //         \/     /_____/     \/     \/         \/     \/                    \/
 
-// ErrOrgNotExist represents a "OrgNotExist" kind of error.
-type ErrOrgNotExist struct {
-	ID   int64
-	Name string
-}
-
-// IsErrOrgNotExist checks if an error is a ErrOrgNotExist.
-func IsErrOrgNotExist(err error) bool {
-	_, ok := err.(ErrOrgNotExist)
-	return ok
-}
-
-func (err ErrOrgNotExist) Error() string {
-	return fmt.Sprintf("org does not exist [id: %d, name: %s]", err.ID, err.Name)
-}
-
 // ErrLastOrgOwner represents a "LastOrgOwner" kind of error.
 type ErrLastOrgOwner struct {
 	UID int64
diff --git a/models/login_source.go b/models/login_source.go
index 2e70228c9ac96..2d453a12f9cfb 100644
--- a/models/login_source.go
+++ b/models/login_source.go
@@ -413,7 +413,7 @@ func LoginViaLDAP(user *User, login, password string, source *LoginSource, autoR
 	sr := source.Cfg.(*LDAPConfig).SearchEntry(login, password, source.Type == LoginDLDAP)
 	if sr == nil {
 		// User not in LDAP, do nothing
-		return nil, ErrUserNotExist{0, login, 0}
+		return nil, ErrUserNotExist{0, login, 0, -1}
 	}
 
 	if !autoRegister {
@@ -524,9 +524,9 @@ func LoginViaSMTP(user *User, login, password string, sourceID int64, cfg *SMTPC
 	if len(cfg.AllowedDomains) > 0 {
 		idx := strings.Index(login, "@")
 		if idx == -1 {
-			return nil, ErrUserNotExist{0, login, 0}
+			return nil, ErrUserNotExist{0, login, 0, -1}
 		} else if !com.IsSliceContainsStr(strings.Split(cfg.AllowedDomains, ","), login[idx+1:]) {
-			return nil, ErrUserNotExist{0, login, 0}
+			return nil, ErrUserNotExist{0, login, 0, -1}
 		}
 	}
 
@@ -545,7 +545,7 @@ func LoginViaSMTP(user *User, login, password string, sourceID int64, cfg *SMTPC
 		tperr, ok := err.(*textproto.Error)
 		if (ok && tperr.Code == 535) ||
 			strings.Contains(err.Error(), "Username and Password not accepted") {
-			return nil, ErrUserNotExist{0, login, 0}
+			return nil, ErrUserNotExist{0, login, 0, -1}
 		}
 		return nil, err
 	}
@@ -585,7 +585,7 @@ func LoginViaSMTP(user *User, login, password string, sourceID int64, cfg *SMTPC
 func LoginViaPAM(user *User, login, password string, sourceID int64, cfg *PAMConfig, autoRegister bool) (*User, error) {
 	if err := pam.Auth(cfg.ServiceName, login, password); err != nil {
 		if strings.Contains(err.Error(), "Authentication failure") {
-			return nil, ErrUserNotExist{0, login, 0}
+			return nil, ErrUserNotExist{0, login, 0, -1}
 		}
 		return nil, err
 	}
@@ -643,7 +643,7 @@ func UserSignIn(username, password string) (*User, error) {
 	} else {
 		trimmedUsername := strings.TrimSpace(username)
 		if len(trimmedUsername) == 0 {
-			return nil, ErrUserNotExist{0, username, 0}
+			return nil, ErrUserNotExist{0, username, 0, -1}
 		}
 
 		user = &User{LowerName: strings.ToLower(trimmedUsername)}
@@ -661,7 +661,7 @@ func UserSignIn(username, password string) (*User, error) {
 				return user, nil
 			}
 
-			return nil, ErrUserNotExist{user.ID, user.Name, 0}
+			return nil, ErrUserNotExist{user.ID, user.Name, 0, -1}
 
 		default:
 			var source LoginSource
@@ -694,5 +694,5 @@ func UserSignIn(username, password string) (*User, error) {
 		log.Warn("Failed to login '%s' via '%s': %v", username, source.Name, err)
 	}
 
-	return nil, ErrUserNotExist{user.ID, user.Name, 0}
+	return nil, ErrUserNotExist{user.ID, user.Name, 0, -1}
 }
diff --git a/models/org.go b/models/org.go
index d43f15f9aaae5..21689382e862a 100644
--- a/models/org.go
+++ b/models/org.go
@@ -177,20 +177,7 @@ func CreateOrganization(org, owner *User) (err error) {
 
 // GetOrgByName returns organization by given name.
 func GetOrgByName(name string) (*User, error) {
-	if len(name) == 0 {
-		return nil, ErrOrgNotExist{0, name}
-	}
-	u := &User{
-		LowerName: strings.ToLower(name),
-		Type:      UserTypeOrganization,
-	}
-	has, err := x.Get(u)
-	if err != nil {
-		return nil, err
-	} else if !has {
-		return nil, ErrOrgNotExist{0, name}
-	}
-	return u, nil
+	return GetUserByNameAndType(name, UserTypeOrganization)
 }
 
 // CountOrganizations returns number of organizations.
diff --git a/models/org_team.go b/models/org_team.go
index 8508a176c195e..87638909d8f84 100644
--- a/models/org_team.go
+++ b/models/org_team.go
@@ -226,11 +226,14 @@ func NewTeam(t *Team) (err error) {
 		return err
 	}
 
-	has, err := x.Id(t.OrgID).Get(new(User))
+	has, err := x.Id(t.OrgID).Get(&User{
+		Type: UserTypeOrganization,
+	})
+
 	if err != nil {
 		return err
 	} else if !has {
-		return ErrOrgNotExist{t.OrgID, ""}
+		return ErrUserNotExist{t.OrgID, "", 0, UserTypeOrganization}
 	}
 
 	t.LowerName = strings.ToLower(t.Name)
diff --git a/models/org_test.go b/models/org_test.go
index 801088c2e21ba..6679dcec2d8d9 100644
--- a/models/org_test.go
+++ b/models/org_test.go
@@ -222,10 +222,11 @@ func TestGetOrgByName(t *testing.T) {
 	assert.Equal(t, "user3", org.Name)
 
 	org, err = GetOrgByName("user2") // user2 is an individual
-	assert.True(t, IsErrOrgNotExist(err))
+	assert.True(t, IsErrUserNotExist(err))
+	assert.Equal(t, UserTypeOrganization, err.(ErrUserNotExist).Type)
 
 	org, err = GetOrgByName("") // corner case
-	assert.True(t, IsErrOrgNotExist(err))
+	assert.True(t, IsErrUserNotExist(err))
 }
 
 func TestCountOrganizations(t *testing.T) {
diff --git a/models/user.go b/models/user.go
index 2a4fb557db76c..073b9df5d3172 100644
--- a/models/user.go
+++ b/models/user.go
@@ -1089,7 +1089,7 @@ func GetUserByKeyID(keyID int64) (*User, error) {
 		return nil, err
 	}
 	if !has {
-		return nil, ErrUserNotExist{0, "", keyID}
+		return nil, ErrUserNotExist{0, "", keyID, -1}
 	}
 	return &user, nil
 }
@@ -1100,7 +1100,7 @@ func getUserByID(e Engine, id int64) (*User, error) {
 	if err != nil {
 		return nil, err
 	} else if !has {
-		return nil, ErrUserNotExist{id, "", 0}
+		return nil, ErrUserNotExist{id, "", 0, -1}
 	}
 	return u, nil
 }
@@ -1116,7 +1116,7 @@ func GetAssigneeByID(repo *Repository, userID int64) (*User, error) {
 	if err != nil {
 		return nil, err
 	} else if !has {
-		return nil, ErrUserNotExist{userID, "", 0}
+		return nil, ErrUserNotExist{userID, "", 0, -1}
 	}
 	return GetUserByID(userID)
 }
@@ -1124,18 +1124,35 @@ func GetAssigneeByID(repo *Repository, userID int64) (*User, error) {
 // GetUserByName returns user by given name.
 func GetUserByName(name string) (*User, error) {
 	if len(name) == 0 {
-		return nil, ErrUserNotExist{0, name, 0}
+		return nil, ErrUserNotExist{0, name, 0, -1}
 	}
 	u := &User{LowerName: strings.ToLower(name)}
 	has, err := x.Get(u)
 	if err != nil {
 		return nil, err
 	} else if !has {
-		return nil, ErrUserNotExist{0, name, 0}
+		return nil, ErrUserNotExist{0, name, 0, -1}
 	}
 	return u, nil
 }
 
+// GetUserByNameAndType returns user by given name and type. //TODO add test
+func GetUserByNameAndType(name string, utype UserType) (*User, error) {
+	u, err := GetUserByName(name)
+	if err != nil {
+		return nil, err
+	}
+	if u.Type != utype {
+		return nil, ErrUserNotExist{0, name, 0, utype}
+	}
+	return u, nil
+}
+
+// GetIndividualUserByName returns user of TypeIndividual by given name. //TODO add test
+func GetIndividualUserByName(name string) (*User, error) {
+	return GetUserByNameAndType(name, UserTypeIndividual)
+}
+
 // GetUserEmailsByNames returns a list of e-mails corresponds to names.
 func GetUserEmailsByNames(names []string) []string {
 	mails := make([]string, 0, len(names))
@@ -1221,7 +1238,7 @@ func ValidateCommitsWithEmails(oldCommits *list.List) *list.List {
 // GetUserByEmail returns the user object by given e-mail if exists.
 func GetUserByEmail(email string) (*User, error) {
 	if len(email) == 0 {
-		return nil, ErrUserNotExist{0, email, 0}
+		return nil, ErrUserNotExist{0, email, 0, -1}
 	}
 
 	email = strings.ToLower(email)
@@ -1245,7 +1262,7 @@ func GetUserByEmail(email string) (*User, error) {
 		return GetUserByID(emailAddress.UID)
 	}
 
-	return nil, ErrUserNotExist{0, email, 0}
+	return nil, ErrUserNotExist{0, email, 0, -1}
 }
 
 // GetUser checks if a user already exists
diff --git a/models/user_mail.go b/models/user_mail.go
index 285ba74f61b2f..0cd5032bcc80f 100644
--- a/models/user_mail.go
+++ b/models/user_mail.go
@@ -197,7 +197,7 @@ func MakeEmailPrimary(email *EmailAddress) error {
 	if err != nil {
 		return err
 	} else if !has {
-		return ErrUserNotExist{email.UID, "", 0}
+		return ErrUserNotExist{email.UID, "", 0, -1}
 	}
 
 	// Make sure the former primary email doesn't disappear.
diff --git a/models/user_openid.go b/models/user_openid.go
index db84e2e08f531..19e064d35cb4a 100644
--- a/models/user_openid.go
+++ b/models/user_openid.go
@@ -100,7 +100,7 @@ func ToggleUserOpenIDVisibility(id int64) (err error) {
 // GetUserByOpenID returns the user object by given OpenID if exists.
 func GetUserByOpenID(uri string) (*User, error) {
 	if len(uri) == 0 {
-		return nil, ErrUserNotExist{0, uri, 0}
+		return nil, ErrUserNotExist{0, uri, 0, -1}
 	}
 
 	uri, err := openid.Normalize(uri)
@@ -120,5 +120,5 @@ func GetUserByOpenID(uri string) (*User, error) {
 		return GetUserByID(oid.UID)
 	}
 
-	return nil, ErrUserNotExist{0, uri, 0}
+	return nil, ErrUserNotExist{0, uri, 0, -1}
 }
diff --git a/modules/context/org.go b/modules/context/org.go
index cfe9a26220704..7f550227ba44f 100644
--- a/modules/context/org.go
+++ b/modules/context/org.go
@@ -48,12 +48,12 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
 	orgName := ctx.Params(":org")
 
 	var err error
-	ctx.Org.Organization, err = models.GetUserByName(orgName)
+	ctx.Org.Organization, err = models.GetOrgByName(orgName)
 	if err != nil {
 		if models.IsErrUserNotExist(err) {
-			ctx.Handle(404, "GetUserByName", err)
+			ctx.Handle(404, "GetOrgByName", err)
 		} else {
-			ctx.Handle(500, "GetUserByName", err)
+			ctx.Handle(500, "GetOrgByName", err)
 		}
 		return
 	}
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 14a8d598559bc..02a522cdb6fc0 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -210,7 +210,7 @@ func orgAssignment(args ...bool) macaron.Handler {
 		if assignOrg {
 			ctx.Org.Organization, err = models.GetOrgByName(ctx.Params(":orgname"))
 			if err != nil {
-				if models.IsErrOrgNotExist(err) {
+				if models.IsErrUserNotExist(err) {
 					ctx.Status(404)
 				} else {
 					ctx.Error(500, "GetOrgByName", err)
diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go
index 31cb9c6b21fd5..aa19443e106bf 100644
--- a/routers/api/v1/repo/collaborators.go
+++ b/routers/api/v1/repo/collaborators.go
@@ -35,7 +35,7 @@ func IsCollaborator(ctx *context.APIContext) {
 		ctx.Error(403, "", "User does not have push access")
 		return
 	}
-	user, err := models.GetUserByName(ctx.Params(":collaborator"))
+	user, err := models.GetIndividualUserByName(ctx.Params(":collaborator"))
 	if err != nil {
 		if models.IsErrUserNotExist(err) {
 			ctx.Error(422, "", err)
@@ -62,7 +62,7 @@ func AddCollaborator(ctx *context.APIContext, form api.AddCollaboratorOption) {
 		ctx.Error(403, "", "User does not have push access")
 		return
 	}
-	collaborator, err := models.GetUserByName(ctx.Params(":collaborator"))
+	collaborator, err := models.GetIndividualUserByName(ctx.Params(":collaborator"))
 	if err != nil {
 		if models.IsErrUserNotExist(err) {
 			ctx.Error(422, "", err)
@@ -94,7 +94,7 @@ func DeleteCollaborator(ctx *context.APIContext) {
 		return
 	}
 
-	collaborator, err := models.GetUserByName(ctx.Params(":collaborator"))
+	collaborator, err := models.GetIndividualUserByName(ctx.Params(":collaborator"))
 	if err != nil {
 		if models.IsErrUserNotExist(err) {
 			ctx.Error(422, "", err)
diff --git a/routers/api/v1/repo/fork.go b/routers/api/v1/repo/fork.go
index 44b79a6fef69c..b53243dab47d9 100644
--- a/routers/api/v1/repo/fork.go
+++ b/routers/api/v1/repo/fork.go
@@ -59,7 +59,7 @@ func CreateFork(ctx *context.APIContext, form api.CreateForkOption) {
 	} else {
 		org, err := models.GetOrgByName(*form.Organization)
 		if err != nil {
-			if models.IsErrOrgNotExist(err) {
+			if models.IsErrUserNotExist(err) {
 				ctx.Error(422, "", err)
 			} else {
 				ctx.Error(500, "GetOrgByName", err)
diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
index 7fb828ddbc004..e0b693a4e5693 100644
--- a/routers/api/v1/repo/repo.go
+++ b/routers/api/v1/repo/repo.go
@@ -156,7 +156,7 @@ func CreateOrgRepo(ctx *context.APIContext, opt api.CreateRepoOption) {
 
 	org, err := models.GetOrgByName(ctx.Params(":org"))
 	if err != nil {
-		if models.IsErrOrgNotExist(err) {
+		if models.IsErrUserNotExist(err) {
 			ctx.Error(422, "", err)
 		} else {
 			ctx.Error(500, "GetOrgByName", err)
diff --git a/routers/user/home.go b/routers/user/home.go
index 71288906908f6..9d581b3f7dd59 100644
--- a/routers/user/home.go
+++ b/routers/user/home.go
@@ -31,12 +31,12 @@ func getDashboardContextUser(ctx *context.Context) *models.User {
 	orgName := ctx.Params(":org")
 	if len(orgName) > 0 {
 		// Organization.
-		org, err := models.GetUserByName(orgName)
+		org, err := models.GetOrgByName(orgName)
 		if err != nil {
 			if models.IsErrUserNotExist(err) {
-				ctx.Handle(404, "GetUserByName", err)
+				ctx.Handle(404, "GetOrgByName", err)
 			} else {
-				ctx.Handle(500, "GetUserByName", err)
+				ctx.Handle(500, "GetOrgByName", err)
 			}
 			return nil
 		}