diff --git a/app/static/app/js/ModelView.jsx b/app/static/app/js/ModelView.jsx
index b149743e2..3a0478ce1 100644
--- a/app/static/app/js/ModelView.jsx
+++ b/app/static/app/js/ModelView.jsx
@@ -298,7 +298,7 @@ class ModelView extends React.Component {
     window.viewer = new Potree.Viewer(container);
     viewer.setEDLEnabled(true);
     viewer.setFOV(60);
-    viewer.setPointBudget(1*1000*1000);
+    viewer.setPointBudget(10*1000*1000);
     viewer.setEDLEnabled(true);
     viewer.loadSettingsFromURL();
         
diff --git a/app/templates/app/registration/login.html b/app/templates/app/registration/login.html
index 164a46e3e..9945dd422 100644
--- a/app/templates/app/registration/login.html
+++ b/app/templates/app/registration/login.html
@@ -10,11 +10,12 @@
     {% endif %}
 
     {% is_single_user_mode as autologin %}
+    {% external_auth_endpoint as ext_auth_ep %}
 
     {% if autologin %}
         <script>location.href='/';</script>
     {% else %}
-    <form action="{% url 'login' %}" method="post" class="form-horizontal" role="form">{% csrf_token %}
+    <form id="loginForm" {% if ext_auth_ep != "" %} style="display: none" {% endif %} action="{% url 'login' %}" method="post" class="form-horizontal" role="form">{% csrf_token %}
         {% for field in form %}
             {% include 'registration/form_field.html' %}
         {% endfor %}
@@ -34,5 +35,39 @@
             </div>
         </div>
     </form>
+
+    {% if ext_auth_ep != '' %}
+    <div class="text-center" id="authLoading">
+        <i class="fa fa-spin fa-circle-notch fa-spin fa-fw fa-2x"></i>
+    </div>
+    <script>
+    function getCookie(name) {
+        var value = "; " + document.cookie;
+        var parts = value.split("; " + name + "=");
+        if (parts.length === 2) return parts.pop().split(';').shift();
+    }
+    function delCookie(name) {
+        document.cookie = name +'=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;';
+    }
+    $(function(){
+        if (getCookie("autologin") !== undefined){
+            $.ajax({
+                url: "{{ ext_auth_ep }}",
+                type: "POST",
+            }).done(function(res){
+                console.log(res);
+                // delCookie("autologin");
+            }).fail(function(){
+
+                // delCookie("autologin");
+            });
+        }else{
+            $("#authLoading").hide();
+            $("#loginForm").show();
+        }
+    });
+    </script>
+    {% endif %}
+
     {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/app/templatetags/settings.py b/app/templatetags/settings.py
index a540ae5eb..e439e161c 100644
--- a/app/templatetags/settings.py
+++ b/app/templatetags/settings.py
@@ -9,6 +9,10 @@
 register = template.Library()
 logger = logging.getLogger('app.logger')
 
+@register.simple_tag
+def external_auth_endpoint():
+    return settings.EXTERNAL_AUTH_ENDPOINT
+
 @register.filter
 def disk_size(megabytes):
     k = 1000