diff --git a/api/api.py b/api/api.py
index 1f45751f99dad014a9570c67e1f6506f69a633e8..7264eb243a0fb2d561472b488b519cb579ebd2a1 100644
--- a/api/api.py
+++ b/api/api.py
@@ -33,7 +33,7 @@ routing_regexes = {
     'sid': '[0-9a-z_]{0,24}',
 
     # User ID: any length, [0-9a-z.@_-]
-    'uid': '[0-9a-z.@_-]*',
+    'uid': '[0-9a-zA-Z.@_-]*',
 
     # Container name
     'cname': 'projects|sessions|acquisitions|collections',
diff --git a/raml/schemas/definitions/user.json b/raml/schemas/definitions/user.json
index 64611eae71b01db89f5535609d74ca9269fbbe58..1df7df810826af0d67b21a0757a4d383ef746649 100644
--- a/raml/schemas/definitions/user.json
+++ b/raml/schemas/definitions/user.json
@@ -2,9 +2,7 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "definitions": {
     "_id":              {
-                          "maxLength": 64,
-                          "minLength": 2,
-                          "pattern": "^[0-9a-z.@_-]*$",
+                          "format": "email",
                           "title": "ID",
                           "type": "string"
                         },