diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index 8273bf9d5..071557d6d 100644
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -584,19 +584,19 @@ settings.tracker_url_format = External Issue Tracker URL Format
 settings.tracker_url_format_desc = You can use placeholder <code>{user} {repo} {index}</code> for user name, repository name and issue index.
 settings.pulls_desc = Enable pull requests to accept public contributions
 settings.danger_zone = Danger Zone
-settings.transfer = Transfer Ownership
-settings.transfer_desc = Transfer this repository to another user or to an organization in which you have admin rights.
 settings.new_owner_has_same_repo = The new owner already has a repository with same name. Please choose another name.
 settings.convert = Convert To Regular Repository
 settings.convert_desc = You can convert this mirror to a regular repository. This cannot be reversed.
-settings.delete = Delete This Repository
-settings.delete_desc = Once you delete a repository, there is no going back. Please be certain.
-settings.transfer_notices_1 = - You will lose access if new owner is a individual user.
-settings.transfer_notices_2 = - You will conserve access if new owner is an organization and if you're one of the owners.
-settings.transfer_form_title = Please enter following information to confirm your operation:
 settings.convert_notices_1 = - This operation will convert this repository mirror into a regular repository and cannot be undone.
 settings.convert_succeed = Repository successfully converted.
 settings.convert_failed = Unable to convert repository.
+settings.transfer = Transfer Ownership
+settings.transfer_desc = Transfer this repository to another user or to an organization in which you have admin rights.
+settings.transfer_notices_1 = - You will lose access if new owner is a individual user.
+settings.transfer_notices_2 = - You will conserve access if new owner is an organization and if you're one of the owners.
+settings.transfer_form_title = Please enter following information to confirm your operation:
+settings.delete = Delete This Repository
+settings.delete_desc = Once you delete a repository, there is no going back. Please be certain.
 settings.delete_notices_1 = - This operation <strong>CANNOT</strong> be undone.
 settings.delete_notices_2 = - This operation will permanently delete the everything of this repository, including Git data, issues, comments and accesses of collaborators.
 settings.delete_notices_fork_1 = - If this repository is public, all forks will become independent after deletion.
diff --git a/models/repo.go b/models/repo.go
index 71493810f..dfd07f198 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -654,7 +654,7 @@ func MigrateRepository(u *User, opts MigrateRepoOptions) (*Repository, error) {
 		return repo, UpdateRepository(repo, false)
 	}
 
-	repo, err = FinishMigrateRepository(repo, repoPath)
+	repo, err = CleanUpMigrateInfo(repo, repoPath)
 	if err != nil {
 		return repo, err
 	}
@@ -663,7 +663,7 @@ func MigrateRepository(u *User, opts MigrateRepoOptions) (*Repository, error) {
 }
 
 // Finish migrating repository with things that don't need to be done for mirrors.
-func FinishMigrateRepository(repo *Repository, repoPath string) (*Repository, error) {
+func CleanUpMigrateInfo(repo *Repository, repoPath string) (*Repository, error) {
 	if err := createUpdateHook(repoPath); err != nil {
 		return repo, fmt.Errorf("createUpdateHook: %v", err)
 	}
diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go
index 5853c2c00..bd68feafc 100644
--- a/modules/auth/repo_form.go
+++ b/modules/auth/repo_form.go
@@ -37,18 +37,6 @@ func (f *CreateRepoForm) Validate(ctx *macaron.Context, errs binding.Errors) bin
 	return validate(errs, ctx.Data, f, ctx.Locale)
 }
 
-type ConvertRepoForm struct {
-	Uid         int64  `binding:"Required"`
-	RepoId      int64  `binding:"Required"`
-	RepoName    string `binding:"Required;AlphaDashDot;MaxSize(100)"`
-	Private     bool
-	Description string `binding:"MaxSize(255)"`
-}
-
-func (f *ConvertRepoForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
-	return validate(errs, ctx.Data, f, ctx.Locale)
-}
-
 type MigrateRepoForm struct {
 	CloneAddr    string `json:"clone_addr" binding:"Required"`
 	AuthUsername string `json:"auth_username"`
diff --git a/routers/repo/setting.go b/routers/repo/setting.go
index 690e7a465..cb541fc98 100644
--- a/routers/repo/setting.go
+++ b/routers/repo/setting.go
@@ -158,19 +158,18 @@ func SettingsPost(ctx *middleware.Context, form auth.RepoSettingForm) {
 			ctx.Error(404)
 			return
 		}
-
 		repo.IsMirror = false
 
-		if _, err := models.FinishMigrateRepository(repo, models.RepoPath(ctx.Repo.Owner.Name, repo.Name)); err != nil {
+		if _, err := models.CleanUpMigrateInfo(repo, models.RepoPath(ctx.Repo.Owner.Name, repo.Name)); err != nil {
 			ctx.RenderWithErr(ctx.Tr("settings.convert.failed"), SETTINGS_OPTIONS, &form)
 			return
 		}
 
-		if 	err := models.UpdateRepository(repo, false); err != nil {
+		if err := models.UpdateRepository(repo, false); err != nil {
 			ctx.RenderWithErr(ctx.Tr("settings.convert.failed"), SETTINGS_OPTIONS, &form)
 			return
 		}
-		log.Trace("Repository converted: %s/%s", ctx.Repo.Owner.Name, repo.Name)
+		log.Trace("Repository converted from mirror to regular: %s/%s", ctx.Repo.Owner.Name, repo.Name)
 		ctx.Flash.Success(ctx.Tr("repo.settings.convert_succeed"))
 		ctx.Redirect(setting.AppSubUrl + "/" + ctx.Repo.Owner.Name + "/" + repo.Name)
 
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 90c03d3e3..4bc422c34 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -178,6 +178,7 @@
 	</div>
 </div>
 
+{{if .Repository.IsMirror}}
 <div class="ui small modal" id="convert-repo-modal">
 	<div class="header">
 		{{.i18n.Tr "repo.settings.convert"}}
@@ -207,6 +208,7 @@
 		</form>
 	</div>
 </div>
+{{end}}
 
 <div class="ui small modal" id="transfer-repo-modal">
 	<div class="header">