diff --git a/media/js/src/modules/snipt.js b/media/js/src/modules/snipt.js
index 6c17ee2..e0b2bb2 100644
--- a/media/js/src/modules/snipt.js
+++ b/media/js/src/modules/snipt.js
@@ -110,6 +110,10 @@
             var $selectLexer = $('select#id_lexer', window.site.$main_edit);
             $selectLexer.chosen();
 
+            // Init user
+            var $selectUser = $('select#id_user', window.site.$main_edit);
+            $selectUser.chosen();
+
             // Blog post
             $('label.blog-post input', window.site.$main_edit).change(function() {
                 var $checkbox = $(this);
@@ -479,6 +483,7 @@
                 'tags': $('label.tags textarea').val(),
                 'tags_list': $('label.tags textarea').val(),
                 'lexer': $('select[name="lexer"]').val(),
+                'intended_user': $('select[name="user"]').val(),
                 'lexer_name': $('select[name="lexer"] option:selected').text(),
                 'code': code,
                 'description': $('textarea[name="description"]').val(),
@@ -674,8 +679,6 @@
             if ($articleNewSnipt.length === 0) {
                 window.site.snipt_list.$el.prepend('<article id="new-snipt" class="hidden snipt"></article>');
 
-                var user = window.user;
-
                 var data = {
                     id: '',
                     blog_post: false,
@@ -688,7 +691,6 @@
                     lexer_name: 'Text only',
                     new_from_js: true,
                     public: true,
-                    intended_user: user,
                     user: {
                         username: '',
                         profile: {
diff --git a/snipts/templates/snipts/snipt-edit-js-template.html b/snipts/templates/snipts/snipt-edit-js-template.html
index 4ef1035..c263900 100644
--- a/snipts/templates/snipts/snipt-edit-js-template.html
+++ b/snipts/templates/snipts/snipt-edit-js-template.html
@@ -37,6 +37,23 @@
                         </div>
                         <aside>
                             <div class="in">
+                                <% if (snipt.new_from_js) { %>
+                                  {% endverbatim %}
+                                  {% if request.user.profile.has_teams %}
+                                    <div class="user">
+                                      <label class="user">
+                                          <span>User / team</span>
+                                          <select name="user" id="id_user">
+                                                <option value="{{ request.user.username }}">{{ request.user.username }}</option>
+                                              {% for team in request.user.profile.teams %}
+                                                <option value="{{ team.slug }}">{{ team.name }}</option>
+                                              {% endfor %}
+                                          </select>
+                                      </label>
+                                    </div>
+                                  {% endif %}
+                                  {% verbatim %}
+                                <% } %>
                                 <div class="type-lexer">
                                   <label class="lexer type-lexer">
                                       <span>Type</span>