diff --git a/generator.go b/generator.go
index 3d8fa2f..cb68bb2 100644
--- a/generator.go
+++ b/generator.go
@@ -109,8 +109,7 @@ func (g *Generator) generateUserTypes(outdir string, api *design.APIDefinition)
 				codegen.SimpleImport("github.com/goadesign/goa"),
 				codegen.SimpleImport("github.com/jinzhu/gorm"),
 				codegen.SimpleImport("golang.org/x/net/context"),
-				codegen.SimpleImport("golang.org/x/net/context"),
-				codegen.SimpleImport("github.com/goadesign/goa/uuid"),
+				codegen.NewImport("uuid", "github.com/satori/go.uuid"),
 			}
 
 			if model.Cached {
@@ -168,8 +167,7 @@ func (g *Generator) generateUserHelpers(outdir string, api *design.APIDefinition
 				codegen.SimpleImport("github.com/goadesign/goa"),
 				codegen.SimpleImport("github.com/jinzhu/gorm"),
 				codegen.SimpleImport("golang.org/x/net/context"),
-				codegen.SimpleImport("golang.org/x/net/context"),
-				codegen.SimpleImport("github.com/goadesign/goa/uuid"),
+				codegen.NewImport("uuid", "github.com/satori/go.uuid"),
 			}
 
 			if model.Cached {