diff --git a/app/controllers/api/v2/tokens_controller.rb b/app/controllers/api/v2/tokens_controller.rb
index 291c33d4..1170945f 100644
--- a/app/controllers/api/v2/tokens_controller.rb
+++ b/app/controllers/api/v2/tokens_controller.rb
@@ -6,6 +6,19 @@ module Api
         [:description]
       end
 
+      def create
+        if params[:token].blank?
+          self.resource = resource_class.new
+        else
+          instantiate_resource
+        end
+
+        resource.user = current_user if current_user.present?
+        authorize resource
+        create_action
+        respond_with_resource
+      end
+
       def my_tokens
         authorize resource_class
         instantiate_collection