diff --git a/crypto/crypto.go b/crypto/crypto.go
index 4c873854a..7278c9ced 100644
--- a/crypto/crypto.go
+++ b/crypto/crypto.go
@@ -1,16 +1,19 @@
 package crypto
 
 import (
+	"crypto/rand"
 	"encoding/base64"
+	"io"
 	"strings"
-
-	"github.com/pborman/uuid"
 )
 
 // SecureToken creates a new random token
 func SecureToken() string {
-	token := uuid.NewRandom()
-	return removePadding(base64.URLEncoding.EncodeToString([]byte(token)))
+	b := make([]byte, 16)
+	if _, err := io.ReadFull(rand.Reader, b); err != nil {
+		panic(err.Error()) // rand should never fail
+	}
+	return removePadding(base64.URLEncoding.EncodeToString(b))
 }
 
 func removePadding(token string) string {