diff --git a/templates/web/prod/upload/upload-flash.html.twig b/templates/web/prod/upload/upload-flash.html.twig
index f59d0ffadb..020478dd87 100644
--- a/templates/web/prod/upload/upload-flash.html.twig
+++ b/templates/web/prod/upload/upload-flash.html.twig
@@ -33,20 +33,20 @@
                                     ({% trans with {'%maxFileSizeReadable%' : maxFileSizeReadable} %}maximum : %maxFileSizeReadable%{% endtrans %})
                                 </span>
                             </td>
-                            <td class='uploader-icon'>
-                                <img src='/assets/common/images/icons/logo-flash.png' width="32px" heigh="32px" title="{{ 'You are using the Flash uploader.' | trans }}"/>
-                            </td>
-                            <td class='uploader-info'>
-                                <p>
-                                    {{ 'You are using the Flash uploader.' | trans }}
-                                    {% if not app['browser'].supportFileAPI() %}
-                                        {{ 'This version does not allow you to access all the features offered by the HTML5 uploader' | trans }}
-                                    {% endif %}
-                                </p>
-                                {% if app['browser'].supportFileAPI() %}
-                                <a id="UPLOAD_HTML5_LINK" href="{{ path('upload_html5_form') }}" class="dialog full-dialog">{{ 'Use the HTML5 uploader' | trans }}</a>
-                                {% endif %}
-                            </td>
+                            {#<td class='uploader-icon'>#}
+                                {#<img src='/assets/common/images/icons/logo-flash.png' width="32px" heigh="32px" title="{{ 'You are using the Flash uploader.' | trans }}"/>#}
+                            {#</td>#}
+                            {#<td class='uploader-info'>#}
+                                {#<p>#}
+                                    {#{{ 'You are using the Flash uploader.' | trans }}#}
+                                    {#{% if not app['browser'].supportFileAPI() %}#}
+                                        {#{{ 'This version does not allow you to access all the features offered by the HTML5 uploader' | trans }}#}
+                                    {#{% endif %}#}
+                                {#</p>#}
+                                {#{% if app['browser'].supportFileAPI() %}#}
+                            <a style="display: none" id="UPLOAD_HTML5_LINK" href="{{ path('upload_html5_form') }}" class="dialog full-dialog">{{ 'Use the HTML5 uploader' | trans }}</a>
+                                {#{% endif %}#}
+                            {#</td>#}
                         </tr>
                      </table>
                     {# settings box #}
@@ -122,6 +122,12 @@
                 </div>
 
             </form>
+            <div>
+                <select name="upload_type" id="upload_type" class="input-large" style="width: 200px; float:right">
+                    <option value="html">{{ 'Use the HTML5 uploader' | trans }}</option>
+                    <option value="flash" selected>{{ 'Use the Flash uploader' | trans }}</option>
+                </select>
+            </div>
          </div>
     </div>
 </div>
diff --git a/templates/web/prod/upload/upload.html.twig b/templates/web/prod/upload/upload.html.twig
index 8a23c0d233..7d642a247e 100644
--- a/templates/web/prod/upload/upload.html.twig
+++ b/templates/web/prod/upload/upload.html.twig
@@ -36,18 +36,18 @@
                                         ({% trans with {'%maxFileSizeReadable%' : maxFileSizeReadable} %}maximum : %maxFileSizeReadable%{% endtrans %})
                                     </span>
                                 </td>
-                                <td class='uploader-icon'>
-                                    <img src='/assets/common/images/icons/html5-logo.png' width="32px" heigh="32px"  title="{{ 'You are using the HTML5 uploader.' | trans }}"/>
-                                </td>
-                                <td class="uploader-infmaxFileSizeo">
-                                    <p>
-                                        {{ 'You are using the HTML5 uploader.' | trans }}
-                                        {% if not app['browser'].supportFileAPI() %}
-                                            {{ 'Your browser does not support all HTML5 features properly.' | trans }}
-                                        {% endif %}
-                                    </p>
-                                    <a id="UPLOAD_FLASH_LINK" href="{{ path('upload_flash_form') }}" class="dialog full-dialog">{{ 'Use the Flash uploader' | trans }}</a>
-                                </td>
+                                {#<td class='uploader-icon'>#}
+                                    {#<img src='/assets/common/images/icons/html5-logo.png' width="32px" heigh="32px"  title="{{ 'You are using the HTML5 uploader.' | trans }}"/>#}
+                                {#</td>#}
+                                {#<td class="uploader-infmaxFileSizeo">#}
+                                    {#<p>#}
+                                        {#{{ 'You are using the HTML5 uploader.' | trans }}#}
+                                        {#{% if not app['browser'].supportFileAPI() %}#}
+                                            {#{{ 'Your browser does not support all HTML5 features properly.' | trans }}#}
+                                        {#{% endif %}#}
+                                    {#</p>#}
+                                <a style="display: none" id="UPLOAD_FLASH_LINK" href="{{ path('upload_flash_form') }}" class="dialog full-dialog">{{ 'Use the Flash uploader' | trans }}</a>
+                                {#</td>#}
                             </tr>
                         </table>
 
@@ -132,6 +132,12 @@
                     </div>
 
                 </form>
+                <div>
+                    <select name="upload_type" id="upload_type" class="input-large" style="width: 200px; float:right">
+                        <option value="html" selected>{{ 'Use the HTML5 uploader' | trans }}</option>
+                        <option value="flash">{{ 'Use the Flash uploader' | trans }}</option>
+                    </select>
+                </div>
             {% else %}
                 {{ 'You can not upload files' | trans }}
             {% endif %}