diff --git a/app/escriptorium/static/js/onboarding.js b/app/escriptorium/static/js/onboarding.js
index 28f3d6a529d5a1dfe37c20ea68fde0ba7df6e9df..4d2711df6c9f0f3a3b33b756ccfdcbabe31e9d09 100644
--- a/app/escriptorium/static/js/onboarding.js
+++ b/app/escriptorium/static/js/onboarding.js
@@ -128,7 +128,8 @@ steps_trans = [{
 ];
 
 function exitonboarding() {
-   if(onboarding_document && onboarding_images && onboarding_edit && onboarding_trans && onboarding_models){
+   if(userProfile.get('onboarding_document') == userProfile.get('onboarding_images') == userProfile.get('onboarding_edit') == userProfile.get('onboarding_trans') ==  userProfile.get('onboarding_models') == true)
+   {
 
        $.ajax({
         type: 'PUT',
diff --git a/app/escriptorium/templates/core/document_form.html b/app/escriptorium/templates/core/document_form.html
index 826978bdfc1fe637e9ec3637af4dbc4bf7d3c0cf..2ba4401ac3b47dd6e0bcf556a7de104083de9498 100644
--- a/app/escriptorium/templates/core/document_form.html
+++ b/app/escriptorium/templates/core/document_form.html
@@ -179,10 +179,14 @@ if (onboarding== "True" && !onboarding_document)
     document_intro.start();
     document_intro.onexit(function() {
         userProfile.set('onboarding_document',true);
+        exitonboarding();
     });
 
     document_intro.oncomplete(function() {
         userProfile.set('onboarding_document',true);
+        exitonboarding();
+        var images_url = "{% url 'document-images' pk=document.pk %}";
+        window.location.href = images_url;
     });
 
 }