diff --git a/models/u2f.go b/models/u2f.go
index 200d417fcc..1224b4a5fb 100644
--- a/models/u2f.go
+++ b/models/u2f.go
@@ -48,7 +48,7 @@ type U2FRegistrationList []*U2FRegistration
 
 // ToRegistrations will convert all U2FRegistrations to u2f.Registrations
 func (list U2FRegistrationList) ToRegistrations() []u2f.Registration {
-	regs := make([]u2f.Registration, len(list))
+	regs := make([]u2f.Registration, 0, len(list))
 	for _, reg := range list {
 		r, err := reg.Parse()
 		if err != nil {
diff --git a/modules/migrations/migrate.go b/modules/migrations/migrate.go
index d72c869626..ac55a2e727 100644
--- a/modules/migrations/migrate.go
+++ b/modules/migrations/migrate.go
@@ -76,6 +76,9 @@ func migrateRepository(downloader base.Downloader, uploader base.Uploader, opts
 	}
 	repo.IsPrivate = opts.Private
 	repo.IsMirror = opts.Mirror
+	if opts.Description != "" {
+		repo.Description = opts.Description
+	}
 	log.Trace("migrating git data")
 	if err := uploader.CreateRepo(repo, opts.Wiki); err != nil {
 		return err