diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc12258c..cc4c2157 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.0.17] - 2023-11-07
+
+### Fixed
+
+-   AzureAD only returned first 100 groups.
+-   Constants with arrays now work correctly
+-   Little ldap test bug
+-   model bug, bad merging and weird caching
+
+### Added
+
+-   Expression field can now have property `value` for manual data assignment
+-   Added form property ansibleCredentials, allowing to pass ansible_user and ansible_password
+
 ## [4.0.16] - 2023-10-07
 
 ### Changed
@@ -590,7 +604,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   Allow change password for current local user
 -   Start tracking versions
 
-[Unreleased]: https://github.com/ansibleguy76/ansibleforms/compare/4.0.16...HEAD
+[Unreleased]: https://github.com/ansibleguy76/ansibleforms/compare/4.0.17...HEAD
+
+[4.0.17]: https://github.com/ansibleguy76/ansibleforms/compare/4.0.16...4.0.17
 
 [4.0.16]: https://github.com/ansibleguy76/ansibleforms/compare/4.0.15...4.0.16
 
diff --git a/app_versions.gradle b/app_versions.gradle
index 2680417f..01104665 100644
--- a/app_versions.gradle
+++ b/app_versions.gradle
@@ -1,2 +1,2 @@
-ext.version_code = 40016
-ext.version_name = "4.0.16"
+ext.version_code = 40017
+ext.version_name = "4.0.17"
diff --git a/client/package.json b/client/package.json
index 99a9cd2a..26f7d74f 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ansible_forms_vue",
-  "version": "4.0.16",
+  "version": "4.0.17",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -12,9 +12,9 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "core-js": "~3.33.0",
-    "vue": "~2.7",
-    "axios": "~1.5.1",
+    "core-js": "~3.33.2",
+    "vue": "~2.7.15",
+    "axios": "~1.6.0",
     "es6-promise": "~4.2.8",
     "vuelidate": "~0.7.7",
     "vue-router": "~3.5.4",
@@ -37,10 +37,10 @@
     "thenby": "*",
     "vue-showdown": "2.4.1",
     "bulma-calendar": "6.1.19",
-    "@fortawesome/fontawesome-svg-core":"~6.2.1",
-    "@fortawesome/free-solid-svg-icons":"~6.2.1",
-    "@fortawesome/free-regular-svg-icons":"~6.2.1",
-    "@fortawesome/free-brands-svg-icons":"~6.2.1",
+    "@fortawesome/fontawesome-svg-core":"~6.4.2",
+    "@fortawesome/free-solid-svg-icons":"~6.4.2",
+    "@fortawesome/free-regular-svg-icons":"~6.4.2",
+    "@fortawesome/free-brands-svg-icons":"~6.4.2",
     "@fortawesome/vue-fontawesome":"2.0.10",
     "@femessage/log-viewer":"*"
 
diff --git a/client/public/assets/css/swagger.css b/client/public/assets/css/swagger.css
index 17ddca5a..58f24b55 100644
--- a/client/public/assets/css/swagger.css
+++ b/client/public/assets/css/swagger.css
@@ -1,4 +1,4 @@
-.topbar-wrapper img[alt="Swagger UI"] {
+.topbar-wrapper>a.link {
     content: url('/assets/img/logo_ansible_forms_full_white.svg');
 }
 
diff --git a/client/src/components/BulmaSettingsMenu.vue b/client/src/components/BulmaSettingsMenu.vue
index 445d08fb..328b2a2d 100644
--- a/client/src/components/BulmaSettingsMenu.vue
+++ b/client/src/components/BulmaSettingsMenu.vue
@@ -31,7 +31,7 @@
           {group:"authentication",title:"Groups",to:"/groups"},
           {group:"authentication",title:"Users",to:"/users"},
           {group:"authentication",title:"Ldap",to:"/ldap"},
-          {group:"authentication",title:"Azure AD",to:"/azuread"},
+          {group:"authentication",title:"MS Entra ID",to:"/azuread"},
           {group:"connection",title:"Credentials",to:"/credentials"},
           {group:"connection",title:"Ssh",to:"/sshkey"},
           {group:"connection",title:"Known Hosts",to:"/knownhosts"},
diff --git a/client/src/components/Form.vue b/client/src/components/Form.vue
index 6730ca36..4971e0fb 100644
--- a/client/src/components/Form.vue
+++ b/client/src/components/Form.vue
@@ -466,6 +466,7 @@
   import Helpers from './../lib/Helpers'
   import Copy from 'copy-to-clipboard'
   import 'vue-json-pretty/lib/styles.css';
+  import Lodash from 'lodash'
   import VueShowdown from 'vue-showdown';
   import { required, minValue,maxValue,minLength,maxLength,helpers,requiredIf,sameAs } from 'vuelidate/lib/validators'
 
@@ -1288,14 +1289,13 @@
             foundfield=foundfield.replace(/\[[0-9]*\]/,'') // make xxx[y] => xxx
             fieldvalue = undefined
             targetflag = undefined
-            // console.log(foundfield + "("+fieldvalue+")" + " -> targetflag = " + targetflag)
             // mark the field as a dependent field
             if(foundfield in ref.form){      // does field xxx exist in our form ?
               // if the field exists
               // and it's from an expression or table
               //   or it's deep link in a column (colum has .)
               // and the reference field is an object
-              if(ref.fieldOptions[foundfield] && (["expression","table"].includes(ref.fieldOptions[foundfield].type)||column.includes(".")) && (typeof ref.form[foundfield]=="object")){
+              if(ref.fieldOptions[foundfield] && (["expression","table","constant"].includes(ref.fieldOptions[foundfield].type)||column.includes(".")) && ((typeof ref.form[foundfield]=="object") || (Array.isArray(ref.form[foundfield])))){
                 // objects and array should be stringified
                 fieldvalue=JSON.stringify(ref.form[foundfield])
                 // console.log(Helpers.replacePlaceholders(match[1],ref.form))
@@ -1345,10 +1345,10 @@
             value=undefined                           // cannot evaluate yet
         }
         if(value!=undefined){
-           value=value.replace("'__undefined__'","undefined")  // replace undefined values
-           value=value.replace("__undefined__","undefined")
-           value=value.replace("'__null__'","null")  // replace undefined values
-           value=value.replace("__null__","null")
+           value=value.replaceAll("'__undefined__'","undefined")  // replace undefined values
+           value=value.replaceAll("__undefined__","undefined")
+           value=value.replaceAll("'__null__'","null")  // replace undefined values
+           value=value.replaceAll("__null__","null")
         }
         return {"hasPlaceholders":hasPlaceholders,"value":value}          // return the result
       },
@@ -1582,6 +1582,10 @@
                       ref.$toast("Cannot reset field status " + item.name)
                     }
                   }
+                } else if(item.value && flag==undefined){
+                  ref.setFieldStatus(item.name,"running",false)
+                  if(item.type=="expression") Vue.set(ref.form, item.name, item.value);
+                  ref.setFieldStatus(item.name,"fixed")
                 }
               }else{  // not visible field
                 if(item.type=="expression"){
@@ -1826,26 +1830,28 @@
       // generate the form json output
       generateJsonOutput(filedata={}){
         var ref=this
-        this.formdata={}
+        var formdata={}
         this.currentForm.fields.forEach((item, i) => {
           // this.checkDependencies(item) // hide field based on dependency
           if(this.visibility[item.name] && !item.noOutput){
             var fieldmodel = [].concat(item.model || [])
             var outputObject = item.outputObject || item.type=="expression" || item.type=="file" || item.type=="table" || false
-            var outputValue
+            var outputValue = undefined
             // if uploaded file info, use that
             if(item.name in filedata){
               outputValue=filedata[item.name]
             // else just use the formdata
             }else{
-              outputValue = this.form[item.name]
+              // deep clone, otherwise weird effects
+              outputValue = JSON.parse(JSON.stringify(this.form[item.name]))
             }
             // if no model is given, we assign to the root
             if(!outputObject){  // do we need to flatten output ?
                 outputValue=this.getFieldValue(outputValue,item.valueColumn || "",true)
             }
             if(fieldmodel.length==0){
-              this.formdata[item.name]=outputValue
+              // deep clone = otherwise weird effects
+              formdata[item.name]=JSON.parse(JSON.stringify(outputValue))
             }else{
               fieldmodel.forEach((f)=>{
                 // convert fieldmodel for actual object
@@ -1853,9 +1859,15 @@
                 // using reduce, which is a recursive function
                 f.split(/\s*\.\s*/).reduce((master,obj, level,arr) => {
                   // if last
+                  
                   if (level === (arr.length - 1)){
                       // the last piece we assign the value to
-                      master[obj]=outputValue
+                      if(master[obj]===undefined){
+                        master[obj]=outputValue
+                      }else{
+                        master[obj]=Lodash.merge(master[obj],outputValue)
+                      }
+                      
                   }else{
                       // initialize first time to object
                       if(master[obj]===undefined){
@@ -1865,13 +1877,14 @@
                   // return the result for next reduce iteration
                   return master[obj]
 
-                },ref.formdata);
+                },formdata);
               })
 
             }
           }
         });
-
+        // update main data
+        Vue.set(this,"formdata",formdata)
       },
       // validate form before submit
       validateForm(){
@@ -1977,7 +1990,6 @@
             .forEach(f => {
               postdata.credentials[f.name]=this.formdata[f.name]
             })
-
  
           this.jobResult.message= "Connecting with job api ";
           this.jobResult.status="info";
@@ -2106,7 +2118,7 @@
           Vue.set(ref.fieldOptions,item.name,{})                                // storing some easy to find options
           Vue.set(ref.fieldOptions[item.name],"evalDefault",item.evalDefault??false)
           if(["expression","query","enum","table","html"].includes(item.type)){
-            Vue.set(ref.fieldOptions[item.name],"isDynamic",!!(item.expression??item.query??false))
+            Vue.set(ref.fieldOptions[item.name],"isDynamic",!!(item.expression??item.query??item.value??false))
             Vue.set(ref.fieldOptions[item.name],"valueColumn",item.valueColumn||"")
             Vue.set(ref.fieldOptions[item.name],"placeholderColumn",item.placeholderColumn||"")
             Vue.set(ref.fieldOptions[item.name],"type",item.type)
@@ -2133,6 +2145,9 @@
         // initiate the constants
         if(ref.constants){
           Object.keys(ref.constants).forEach((item)=>{
+            ref.fieldOptions[item]={
+              type: "constant",
+            }
             Vue.set(ref.form,item,ref.constants[item])
           })
         }
diff --git a/client/src/views/AzureAd.vue b/client/src/views/AzureAd.vue
index d9a77063..169d5ac2 100644
--- a/client/src/views/AzureAd.vue
+++ b/client/src/views/AzureAd.vue
@@ -1,7 +1,7 @@
 <template>
   <section v-if="isAdmin" class="section">
     <div class="container">
-      <h1 class="title has-text-info"><font-awesome-icon icon="address-card" /> Azure AD</h1>
+      <h1 class="title has-text-info"><font-awesome-icon icon="address-card" /> MS Entra ID</h1>
       <div class="columns">
         <div class="column is-narrow">
           <BulmaSettingsMenu />
@@ -10,12 +10,12 @@
           <nav class="level">
             <!-- Left side -->
             <div class="level-left">
-              <p class="level-item"><BulmaButton icon="save" label="Update AzureAd" @click="updateAzureAd()"></BulmaButton></p>
+              <p class="level-item"><BulmaButton icon="save" label="Update" @click="updateAzureAd()"></BulmaButton></p>
             </div>
           </nav>      
           <div class="columns">
             <div class="column">
-              <BulmaCheckbox checktype="checkbox" v-model="azuread.enable" label="Enable Azure AD" />
+              <BulmaCheckbox checktype="checkbox" v-model="azuread.enable" label="Enable MS Entra ID" />
               <div class="mt-2">
                 <BulmaInput :disabled="!azuread.enable" icon="user-tag" v-model="azuread.client_id" label="Client Id" placeholder="" :required="true" :hasError="$v.azuread.client_id.$invalid" :errors="[]" />
                 <BulmaInput :disabled="!azuread.enable" icon="user-secret" v-model="azuread.secret_id" type="password" label="Secret Id" placeholder="" :required="true" :hasError="$v.azuread.secret_id.$invalid" :errors="[]" />
diff --git a/client/src/views/Login.vue b/client/src/views/Login.vue
index 43d46050..f02cbf84 100644
--- a/client/src/views/Login.vue
+++ b/client/src/views/Login.vue
@@ -68,34 +68,42 @@
             this.$toast.error("Failed to get settings")
           })
         },
-        getGroupsAndLogin(azuretoken){
-
+        getGroupsAndLogin(azuretoken, url = `${this.azureGraphUrl}/v1.0/me/transitiveMemberOf`, allGroups = []) {
           const config = {
-              headers: { 
-                Authorization: `Bearer ${azuretoken}`
-              }
+            headers: {
+              Authorization: `Bearer ${azuretoken}`
+            }
           };
-          axios.get(`${this.azureGraphUrl}/v1.0/me/transitiveMemberOf`,config)
-          .then((res) => {
-            const groups = res.data.value.map(x=>('azuread/'+x.displayName))
-            axios.post('/api/v1/auth/azureadoauth2/login',{azuretoken,groups})
-            .then((result)=>{
-              if(result.data.token){
-                TokenStorage.storeToken(result.data.token)
-                TokenStorage.storeRefreshToken(result.data.refreshtoken)
-                this.$emit("authenticated", result.data.token);   
-              }else{
-                this.$toast.error("Azure AD Login failed, no token found")
+
+          axios.get(url, config)
+            .then((res) => {
+              const groups = res.data.value.filter(x => x.displayName).map(x => ('azuread/' + x.displayName));
+              allGroups = allGroups.concat(groups);
+
+              if (res.data['@odata.nextLink']) {
+                // If there's a nextLink, make a recursive call to get the next page of data
+                this.getGroupsAndLogin(azuretoken, res.data['@odata.nextLink'], allGroups);
+              } else {
+                // No more nextLink, you have all the groups
+                axios.post('/api/v1/auth/azureadoauth2/login', { azuretoken, groups:allGroups })
+                  .then((result) => {
+                    if (result.data.token) {
+                      TokenStorage.storeToken(result.data.token);
+                      TokenStorage.storeRefreshToken(result.data.refreshtoken);
+                      this.$emit("authenticated", result.data.token);
+                    } else {
+                      this.$toast.error("Azure AD Login failed, no token found");
+                    }
+                  })
+                  .catch((err) => {
+                    console.log(err);
+                    this.$toast.error("Azure AD Login failed");
+                  });
               }
             })
-            .catch((err)=>{
-              console.log(err)
-              this.$toast.error("Azure AD Login failed")
-            })            
-          })
-          .catch((err)=>{
-            this.$toast.error("Failed to get groupmembership")
-          })
+            .catch((err) => {
+              this.$toast.error("Failed to get group membership");
+            });
         },
         login() {
 
diff --git a/docs/_data/help.yaml b/docs/_data/help.yaml
index 27fc852f..4483ef17 100644
--- a/docs/_data/help.yaml
+++ b/docs/_data/help.yaml
@@ -1022,6 +1022,14 @@
                   - vcenter_dev
                 default: ad_prod                     
                 asCredential: true
+      - name: ansibleCredentials
+        type: string
+        group: basic
+        version: 4.0.17
+        allowed: a local credentialname
+        short: Pass ansible_user and ansible_password to ansible playbook using stored credentials
+        description: |
+          Ansible allows to pass default ansible credentials in the form of 2 extravars ansible_user and ansible_password
       - name: repo
         type: object
         with_types: git
@@ -2267,6 +2275,30 @@
                 - name: your_choice
                   type: local
                   expression: "'You chose $(cities2.name) or just short $(cities2.short)'"
+          - name: value
+            type: any
+            group: data
+            short: A fixed value (any type) for the expression
+            description: |
+              To manually populate an expression field (dictionary, array, number, boolean, string).  
+              runLocal will be ignored.  
+            with_types: expression
+            version: 4.0.17
+            examples:
+            - name: list of cities
+              code: |
+                - name: cities
+                  type: expression
+                  value:
+                  - Rome
+                  - Paris
+            - name: custom object
+              code: |
+                - name: myObject
+                  type: expression
+                  value:
+                    foo: bar
+                    ping: pong
           - name: default
             type: many
             group: data
@@ -4257,4 +4289,30 @@
           columns:
             - name
           valueColumn: name           
+  - name: Database upgrade to 8.x
+    short: Database upgrade to 8.x
+    description: |
+      At some point you will want to upgrade the MySql database.  
+      Initially, Ansible Forms came with MySql 5.7, but you can upgrade the database of course.  
+      With docker-compose you can simple change the mysql version number in the docker-compose.yaml file. (the current docker-compose file uses 8.1) 
+      After a docker-compose down/up, the new image will be pulled and installed.  
+      The upgrade is completely transparent, however, after an upgrade from 5.7 to 8.x you will get warnings about `caching_sha2_password`, a newer method of password handling.  
+      To remove the warning you need to do 2 steps:  
+
+      1) Connect to your mysql server and run this :  
+        
+      `ALTER USER 'root'@'%' IDENTIFIED WITH caching_sha2_password BY 'MyPassword';`  
+      `ALTER USER 'root'@'localhost' IDENTIFIED WITH caching_sha2_password BY 'MyPassword';`  
+        
+      **NOTE** : Obviously, you need to correct the username and password if you use another connection user and or password.  
+
+      2) In the `my.cnf` file, you need to change this :  
+        
+      ```
+      [mysqld]
+      default_authentication_plugin=caching_sha2_password
+      ```
+        
+      **NOTE** : in the docker-compose solution the location is `${your-docker-compose-path}/data/mysql/my.cnf`
+
   
\ No newline at end of file
diff --git a/docs/doks-theme/_includes/site-footer.html b/docs/doks-theme/_includes/site-footer.html
index c0fbec0a..62cf2f87 100644
--- a/docs/doks-theme/_includes/site-footer.html
+++ b/docs/doks-theme/_includes/site-footer.html
@@ -38,8 +38,7 @@
 <script type="text/javascript" src="{% if jekyll.environment == 'production' %}{{ site.doks.baseurl }}{% endif %}/doks-theme/assets/js/vendor/bootstrap/scrollspy.min.js"></script>
 <script type="text/javascript" src="{% if jekyll.environment == 'production' %}{{ site.doks.baseurl }}{% endif %}/doks-theme/assets/js/vendor/matchHeight.min.js"></script>
 <script type="text/javascript" src="{% if jekyll.environment == 'production' %}{{ site.doks.baseurl }}{% endif %}/doks-theme/assets/js/vendor/tipuesearch_content.js"></script>
-<script type="text/javascript" src="{% if jekyll.environment == 'production' %}{{ site.doks.baseurl }}{% endif %}/doks-theme/assets/js/vendor/tipuesearch_set.js"></script>
-<script type="text/javascript" src="{% if jekyll.environment == 'production' %}{{ site.doks.baseurl }}{% endif %}/doks-theme/assets/js/vendor/tipuesearch.min.js"></script>
+<script type="text/javascript" src="{% if jekyll.environment == 'production' %}{{ site.doks.baseurl }}{% endif %}/doks-theme/assets/js/vendor/tipuesearch_lite.js"></script>
 <script type="text/javascript" src="{% if jekyll.environment == 'production' %}{{ site.doks.baseurl }}{% endif %}/doks-theme/assets/js/scripts.js"></script>
 <script type="text/javascript" src="{% if jekyll.environment == 'production' %}{{ site.doks.baseurl }}{% endif %}/doks-theme/assets/js/custom.js"></script>
 <script src="https://kit.fontawesome.com/ae0b34224f.js" crossorigin="anonymous"></script>
diff --git a/docs/doks-theme/assets/js/scripts.js b/docs/doks-theme/assets/js/scripts.js
index 0c228f11..00168a4a 100644
--- a/docs/doks-theme/assets/js/scripts.js
+++ b/docs/doks-theme/assets/js/scripts.js
@@ -175,6 +175,6 @@
 
 
 	// search
-	$('#tipue_search_input').tipuesearch();	
+	// $('#tipue_search_input').tipuesearch();	
 
 }( jQuery ) );
diff --git a/docs/doks-theme/assets/js/vendor/tipuesearch.min.js b/docs/doks-theme/assets/js/vendor/tipuesearch.min.js
index 73e01040..fd370fd5 100644
--- a/docs/doks-theme/assets/js/vendor/tipuesearch.min.js
+++ b/docs/doks-theme/assets/js/vendor/tipuesearch.min.js
@@ -1,4 +1,4 @@
-(function($){$.fn.tipuesearch=function(options){var set=$.extend({'contentLocation':'tipuesearch/tipuesearch_content.json','contextBuffer':60,'contextLength':60,'contextStart':90,'debug':false,'descriptiveWords':25,'highlightTerms':true,'liveContent':'*','liveDescription':'*','minimumLength':3,'mode':'static','newWindow':false,'show':9,'showContext':true,'showRelated':true,'showTime':true,'showTitleCount':true,'showURL':true,'wholeWords':true},options);return this.each(function(){var tipuesearch_in={pages:[]};$.ajaxSetup({async:false});var tipuesearch_t_c=0;$('#tipue_search_content').hide().html('<div class="tipue_search_spinner"><div class="tipue_search_rect1"></div><div class="tipue_search_rect2"></div><div class="rect3"></div></div>').show();if(set.mode=='live')
+(function($){$.fn.tipuesearch=function(options){var set=$.extend({'contentLocation':'tipuesearch/tipuesearch_content.json','contextBuffer':60,'contextLength':160,'contextStart':90,'debug':false,'descriptiveWords':25,'highlightTerms':true,'liveContent':'*','liveDescription':'*','minimumLength':3,'mode':'static','newWindow':false,'show':9,'showContext':true,'showRelated':true,'showTime':true,'showTitleCount':true,'showURL':true,'wholeWords':true},options);return this.each(function(){var tipuesearch_in={pages:[]};$.ajaxSetup({async:false});var tipuesearch_t_c=0;$('#tipue_search_content').hide().html('<div class="tipue_search_spinner"><div class="tipue_search_rect1"></div><div class="tipue_search_rect2"></div><div class="rect3"></div></div>').show();if(set.mode=='live')
 {for(var i=0;i<tipuesearch_pages.length;i++)
 {$.get(tipuesearch_pages[i]).done(function(html)
 {var cont=$(set.liveContent,html).text();cont=cont.replace(/\s+/g,' ');var desc=$(set.liveDescription,html).text();desc=desc.replace(/\s+/g,' ');var t_1=html.toLowerCase().indexOf('<title>');var t_2=html.toLowerCase().indexOf('</title>',t_1+7);if(t_1!=-1&&t_2!=-1)
diff --git a/docs/doks-theme/assets/js/vendor/tipuesearch_lite.js b/docs/doks-theme/assets/js/vendor/tipuesearch_lite.js
new file mode 100644
index 00000000..4df982a4
--- /dev/null
+++ b/docs/doks-theme/assets/js/vendor/tipuesearch_lite.js
@@ -0,0 +1,181 @@
+// Tipue Search Lite
+// Licensed under the MIT license. See the LICENSE file for details.
+
+// list from http://www.ranks.nl/stopwords
+const commonTerms = ["a", "above", "after", "again", "against", "all", "am", "an", "and", "any", "are", "aren't", "as", "at", "be", "because", "been", "before", "being", "below", "between", "both", "but", "by", "can't", "cannot", "could", "couldn't", "did", "didn't", "do", "does", "doesn't", "doing", "don't", "down", "during", "each", "few", "for", "from", "further", "had", "hadn't", "has", "hasn't", "have", "haven't", "having", "he", "he'd", "he'll", "he's", "her", "here", "here's", "hers", "herself", "him", "himself", "his", "how", "how's", "i", "i'd", "i'll", "i'm", "i've", "if", "in", "into", "is", "isn't", "it", "it's", "its", "itself", "let's", "me", "more", "most", "mustn't", "my", "myself", "no", "nor", "not", "of", "off", "on", "once", "only", "or", "other", "ought", "our", "ours", "ourselves", "out", "over", "own", "same", "shan't", "she", "she'd", "she'll", "she's", "should", "shouldn't", "so", "some", "such", "than", "that", "that's", "the", "their", "theirs", "them", "themselves", "then", "there", "there's", "these", "they", "they'd", "they'll", "they're", "they've", "this", "those", "through", "to", "too", "under", "until", "up", "very", "was", "wasn't", "we", "we'd", "we'll", "we're", "we've", "were", "weren't", "what", "what's", "when", "when's", "where", "where's", "which", "while", "who", "who's", "whom", "why", "why's", "with", "won't", "would", "wouldn't", "you", "you'd", "you'll", "you're", "you've", "your", "yours", "yourself", "yourselves"];
+
+window.onload = function execute(){
+    var set = {
+        "contextLength": 200,
+        "showContext": true,
+        "showTime": true,
+        "showURL": false
+    };
+
+    var originalDocumentTitle = document.title;
+    let params = new URLSearchParams(document.location.search.substring(1));
+
+    // call search (if opened as a link)
+    if (params.get("q")) {
+        document.getElementById("tipue_search_input").value = params.get("q");
+        getTipueSearch();
+    }
+
+    // search via search-box
+    document.getElementById('tipue_search_input').form.onsubmit = function() {
+        getTipueSearch();
+        let historyUrl = '';
+        let historyTitle = '';
+        let query = document.getElementById("tipue_search_input").value;
+        if (query) {
+            historyUrl = historyUrl + '?q=' + query;
+            historyTitle = 'Search - ' + query;
+        } else {
+            historyUrl = location.href.split('?')[0];
+        }
+        // add to address bar and history
+        history.pushState({}, historyTitle, historyUrl);
+        return false;
+    };
+
+    function getTipueSearch() {
+        const startTimer = new Date().getTime();
+        let results = [];
+        let resultsHTML = "";
+        let searchTerms = parseQuery(document.getElementById("tipue_search_input").value);
+        let commonTermHits = commonTerms.filter(item => searchTerms.includes(item));
+        searchTerms = searchTerms.filter(item => !commonTermHits.includes(item));
+        results = getSearchResults(searchTerms, tipuesearch);
+        document.title = "(" + results.length + ") " + originalDocumentTitle;
+
+        // build HTML for each result
+        for (const r of results) {
+            resultsHTML += "<div class='tipue_search_result'>";
+            resultsHTML += "<div class='tipue_search_content_title'><a href='" + r.url + "'>" + r.title + "</a></div>";
+            if (set.showURL) {
+                resultsHTML += "<div class='tipue_search_content_url'><a href='" + r.url + "'>" + r.url + "</a></div>";
+            }
+            // modify results and add to html output
+            if (r.text && set.showContext) {
+                let pageText = selectPageContext(r.text, searchTerms);
+                pageText = highlightSearchTerms(pageText, searchTerms);
+                resultsHTML += "<div class='tipue_search_content_text'>" + pageText + "</div>";
+            }
+            if (r.note) {
+                resultsHTML += "<div class='tipue_search_note'>" + r.note + "</div>";
+            }
+            resultsHTML += "</div>";
+        }
+        // add information to beginning of the output
+        resultsHTML = buildResultsInfo(results, startTimer, commonTermHits) + resultsHTML;
+        // give the page the actual contents, which were build up
+        document.getElementById("tipue_search_content").innerHTML = resultsHTML;
+    }
+
+    function buildResultsInfo(results, startTimer, commonTermHits) {
+        let resultsInfo = ""
+        if (results.length == 1) {
+            resultsInfo += "<div id='tipue_search_results_count'>1 result";
+        } else {
+            resultsInfo += "<div id='tipue_search_results_count'>" + results.length + " results";
+        }
+        // display search time
+        if (set.showTime) {
+            const endTimer = new Date().getTime();
+            const time = (endTimer - startTimer) / 1000;
+            resultsInfo += " (" + time.toFixed(2) + " seconds)";
+        }
+        resultsInfo += "</div>";
+        if (commonTermHits.length > 0) {
+            resultsInfo += "<div id='tipue_ignored_words'>Common words \"" + commonTermHits.join(", ") + "\" got ignored.</div>";
+        }
+        return resultsInfo;
+    }
+
+    function getSearchResults(searchTerms, tipueIndex) {
+        let results = [];
+        for (const page of tipueIndex.pages) {
+            let score = scoreText(searchTerms, page.title) + scoreText(searchTerms, page.text);
+            if (score != 0) {
+                page.score = score;
+                results.push(page);
+            }
+        }
+        results.sort(function(a, b) { return b.score - a.score });
+        return results;
+    }
+
+    function parseQuery(query) {
+        let searchTerms = [];
+        while (query.length > 0) {
+            query = query.trim();
+            if (query.charAt(0) == '"' && query.includes('"', 1)) {
+                end = query.indexOf('"', 1);
+                searchTerms.push(query.slice(1, end));
+                query = query.slice(end + 1);
+            } else if (query.charAt(0) == "'" && query.includes("'", 1)) {
+                end = query.indexOf("'", 1);
+                searchTerms.push(query.slice(1, end));
+                query = query.slice(end + 1);
+            } else if (query.includes(" ", 1)) {
+                end = query.indexOf(" ", 1);
+                searchTerms.push(query.slice(0, end));
+                query = query.slice(end + 1);
+            } else {
+                searchTerms.push(query);
+                query = '';
+            }
+        }
+        searchTerms = searchTerms.filter(item => (item));
+        searchTerms = searchTerms.map(searchTerm => searchTerm.toLowerCase());
+        // remove duplicates
+        searchTerms = [...new Set(searchTerms)];
+        return searchTerms;
+    }
+
+    function selectPageContext(pageText, searchTerms) {
+        let tempText = pageText;
+        let bestText = tempText.slice(0, set.contextLength);
+        let bestScore = 0;
+        while (tempText.length > 0) {
+            let currentText = tempText.slice(0, set.contextLength);
+            currentText = currentText.slice(0, currentText.lastIndexOf(" "));
+            let score = scoreText(searchTerms, currentText);
+            if (score > bestScore) {
+                bestScore = score;
+                bestText = currentText;
+            }
+            // check, otherwise endless loop
+            if (tempText.indexOf(" ") > -1) {
+                tempText = tempText.slice(tempText.indexOf(" ") + 1);
+            } else {
+                tempText = "";
+            }
+        }
+        if (pageText.length > set.contextLength) {
+            if (pageText.slice(0, bestText.length) == bestText) {
+                return bestText + " ...";
+            } else {
+                return "... " + bestText + " ...";
+            }
+        }
+        return bestText;
+    }
+
+    function highlightSearchTerms(partialPageText, searchTerms) {
+        for (const term of searchTerms) {
+            let patr = new RegExp("(" + term + ")", "gi");
+            partialPageText = partialPageText.replace(patr, "<span class=\"fw-bold\">$1</span>");
+        }
+        return partialPageText;
+    }
+
+    function scoreText(searchTerms, text) {
+        let score = 0;
+        for (const term of searchTerms) {
+            let numMatches = text.toLowerCase().split(term).length - 1;
+            score += numMatches * term.length;
+        }
+        return score;
+    }
+}
\ No newline at end of file
diff --git a/server/Dockerfile b/server/Dockerfile
index 9bbc7a71..5eca66e9 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -24,6 +24,7 @@ RUN apk add --update --no-cache --virtual .build-deps g++ gcc libxml2-dev libxsl
 RUN apk add --no-cache libxslt
 RUN apk add --no-cache mysql-client
 RUN apk add --no-cache curl
+RUN apk add --no-cache py3-pyldap
 RUN pip3 install --no-cache-dir lxml
 RUN apk del .build-deps
 RUN pip3 install PyMySQL
diff --git a/server/config/log.config.js b/server/config/log.config.js
index fba1081d..b9fa0c75 100644
--- a/server/config/log.config.js
+++ b/server/config/log.config.js
@@ -3,6 +3,7 @@ const path =require("path")
 if(process.env.LOG_CONSOLE_LEVEL=="silly"){ // old loglevel
   process.env.LOG_CONSOLE_LEVEL="debug"
 }
+
 var log_config = {
   level: process.env.LOG_LEVEL || "notice",
   path: process.env.LOG_PATH || path.resolve(__dirname + '/../persistent/logs'),
diff --git a/server/package.json b/server/package.json
index 29881183..05bd4655 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ansible_forms",
-  "version": "4.0.16",
+  "version": "4.0.17",
   "repository": {
     "type": "git",
     "url": "git://github.com/ansibleguy76/ansibleforms.git"
@@ -17,8 +17,8 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "core-js": "~3.33.0",
-    "axios": "~1.5.1",
+    "core-js": "~3.33.2",
+    "axios": "~1.6.0",
     "cors": "~2.8.5",
     "bcrypt": "~5.1.0",
     "cheerio": "~1.0.0-rc.12",
@@ -26,25 +26,25 @@
     "express": "~4.18.2",
     "multer": "~1.4.5-lts.1",
     "express-session": "~1.17.3",
-    "winston": "~3.10.0",
+    "winston": "~3.11.0",
     "winston-syslog": "~2.7.0",
     "winston-daily-rotate-file": "~4.7.1",
     "passport": "~0.6.0",
     "modern-passport-http": "~0.3.0",
     "passport-jwt": "~4.0.1",
     "@outlinewiki/passport-azure-ad-oauth2": "~0.1.0",
-    "mysql2": "~3.6.1",
+    "mysql2": "~3.6.2",
     "ajv": "~6.12.6",
     "ajv-error-parser": "~1.0.7",
     "lodash": "~4.17.21",
     "bluebird": "~3.7.2",
-    "node-jq": "~4.0.1",
+    "node-jq": "~4.2.2",
     "moment": "~2.29.4",
-    "yaml": "~2.3.2",
+    "yaml": "~2.3.4",
     "cert-info":"~1.5.1",
     "thenby":"~1.3.4",
     "mssql":"~10.0.1",
-    "mongodb":"~6.1.0",
+    "mongodb":"~6.2.0",
     "pg":"~8.11.3",
     "ip":"1.1.8",
     "dayjs": "1.11.10",
@@ -55,11 +55,11 @@
     "ldapjs": "~3.0.5",
     "read-last-lines": "~1.8.0",
     "swagger-ui-express": "~5.0.0",
-    "nodemailer": "~6.9.5",
-    "nanoid": "~3.3.6"
+    "nodemailer": "~6.9.7",
+    "nanoid": "~3.3.7"
   },
   "devDependencies": {
-    "@babel/core": "7.23.0",
+    "@babel/core": "7.23.2",
     "@babel/cli": "~7.23.0",
     "@babel/node": "~7.22.19",
     "@babel/eslint-parser": "7.22.15",
@@ -67,7 +67,7 @@
     "rifraf": "~2.0.3",
     "npm-run-all": "*",
     "dotenv": "~16.3.1",
-    "eslint": "~8.51.0"
+    "eslint": "~8.53.0"
   },
   "eslintConfig": {
     "root": true,
diff --git a/server/schema/forms_schema.json b/server/schema/forms_schema.json
index a800fd5a..d081f540 100644
--- a/server/schema/forms_schema.json
+++ b/server/schema/forms_schema.json
@@ -122,6 +122,7 @@
                 "enum": ["awx"]
               },
               "playbook": {"not":{}},
+              "ansibleCredentials": {"not":{}},
               "repo": {"not":{}},
               "steps": {"not":{}}
             },
@@ -136,6 +137,7 @@
               "template": {"not":{}},
               "inventory": {"not":{}},
               "awxCredentials": {"not":{}},
+              "ansibleCredentials": {"not":{}},
               "tags": {"not":{}},
               "check": {"not":{}},
               "limit": {"not":{}},
@@ -155,6 +157,7 @@
               "template": {"not":{}},
               "inventory": {"not":{}},
               "awxCredentials": {"not":{}},
+              "ansibleCredentials": {"not":{}},
               "tags": {"not":{}},
               "check": {"not":{}},
               "limit": {"not":{}},
@@ -352,6 +355,7 @@
                       },
                       "playbook": {"not":{}},
                       "repo": {"not":{}},
+                      "ansibleCredentials": {"not":{}},
                       "steps": {"not":{}}
                     },
                     "required": ["template"]
@@ -364,6 +368,7 @@
                       "playbook": {"not":{}},
                       "template": {"not":{}},
                       "inventory": {"not":{}},
+                      "ansibleCredentials": {"not":{}},
                       "tags": {"not":{}},
                       "check": {"not":{}},
                       "limit": {"not":{}},
@@ -404,7 +409,10 @@
                   },
                   "additionalProperties": false,
                   "uniqueProperties": true            
-                },           
+                },    
+                "ansibleCredentials": {
+                  "type": "string"
+                },      
                 "inventory": {"type": "string"},
                 "tags": {"type": "string"},
                 "check": {"type": "boolean"},
@@ -511,7 +519,10 @@
               "type": "string",
               "default": ""
             }
-          },                              
+          }, 
+          "ansibleCredentials":{
+            "type": "string"
+          },                             
           "inventory": {"type": "string"},
           "executionEnvironment": {"type": "string"},
           "tags": {"type": "string"},
@@ -876,6 +887,32 @@
                   },
                   "required": ["expression"]
                 },
+                {
+                  "properties": {
+                    "type": {
+                      "enum": ["expression","local","local_out"]
+                    },
+                    "minValue": {"not":{}},
+                    "maxValue": {"not":{}},
+                    "minSize": {"not":{}},
+                    "maxSize": {"not":{}},
+                    "sticky": {"not":{}},
+                    "horizontal": {"not":{}},
+                    "pctColumns": {"not":{}},
+                    "filterColumns": {"not":{}},
+                    "dbConfig": {"not":{}},
+                    "multiple": {"not":{}},
+                    "allowDelete": {"not":{}},
+                    "allowInsert": {"not":{}},
+                    "deleteMarker": {"not":{}},
+                    "insertMarker": {"not":{}},
+                    "readonlyColumns": {"not":{}},
+                    "keydown": {"not":{}},
+                    "expression": {"not":{}},
+                    "outputObject": {"not":{}}
+                  },
+                  "required": ["value"]
+                },                
                 {
                   "properties": {
                     "type": {
@@ -1220,6 +1257,15 @@
                       ]                    
                   }
                 },
+                "value": {
+                  "anyOf": [
+                    {"type": "string"},
+                    {"type": "boolean"},
+                    {"type": "array"},
+                    {"type": "object"},
+                    {"type": "integer"}
+                  ]
+                },                
                 "multiple": {
                   "type": "boolean",
                   "default": false
diff --git a/server/src/configure.js b/server/src/configure.js
index 6d788ed7..7fe44a05 100644
--- a/server/src/configure.js
+++ b/server/src/configure.js
@@ -1,3 +1,9 @@
+// load the .env.development file ; it loads a bunch of environment variables
+// we are not doing this for production, where the variables are coming from the actual environment
+if (process.env.NODE_ENV !== 'production' || process.env.FORCE_DOTENV==1 || process.env.FORCE_DOTENV=="1" ){
+  console.log(`Importing .env file : ${__dirname}/../.env.${process.env.NODE_ENV}` )
+  require('dotenv').config({ path: `${__dirname}/../.env.${process.env.NODE_ENV}` })
+}
 // express is the base http server for nodejs
 const express = require('express');
 const session = require('express-session');
@@ -15,12 +21,6 @@ const bodyParser = require('body-parser');
 const passport = require('passport');
 // a small custom middleware to check whether the user is administrator
 const checkAdminMiddleware = require('./lib/common').checkAdminMiddleware
-// load the .env.development file ; it loads a bunch of environment variables
-// we are not doing this for production, where the variables are coming from the actual environment
-if (process.env.NODE_ENV !== 'production' || process.env.FORCE_DOTENV==1 || process.env.FORCE_DOTENV=="1" ){
-    console.log(`Importing .env file : ${__dirname}/../.env.${process.env.NODE_ENV}` )
-    require('dotenv').config({ path: `${__dirname}/../.env.${process.env.NODE_ENV}` })
-}
 
 // our personal app settings
 const appConfig = require('../config/app.config')
diff --git a/server/src/lib/common.js b/server/src/lib/common.js
index 6d1614d7..a1db6039 100644
--- a/server/src/lib/common.js
+++ b/server/src/lib/common.js
@@ -28,6 +28,11 @@ Helpers.getError=function(err){
   }
 }
 
+Helpers.escapeStringForCommandLine=function(value) {
+  const escaped = value.replace(/'/g, "\\'")
+  return escaped;
+}
+
 Helpers.checkCertificate=function(cert){
   certs=cert.replace(/-----(\r\n|\n|\r)-----/gm,"-----|-----").split("|")
   if(certs.length>1){
diff --git a/server/src/lib/logger.js b/server/src/lib/logger.js
index cb9697c5..c8691d8c 100644
--- a/server/src/lib/logger.js
+++ b/server/src/lib/logger.js
@@ -2,7 +2,6 @@ const winston = require('winston');
 require('winston-daily-rotate-file');
 require('winston-syslog').Syslog;
 const loggerConfig = require('../../config/log.config');
-
 const color = {
 'info': process.env.LOG_COLOR_INFO || "\x1b[32m",
 'error': process.env.LOG_COLOR_ERROR || "\x1b[31m",
diff --git a/server/src/models/job.model.js b/server/src/models/job.model.js
index 71b35d9a..57aa628f 100644
--- a/server/src/models/job.model.js
+++ b/server/src/models/job.model.js
@@ -20,7 +20,7 @@ function pushForminfoToExtravars(formObj,extravars,creds={}){
   // push top form fields to extravars
   // change in 4.0.16 => easier to process & available in playbook, might be handy
   // no credentials added here, because then can also come from asCredential property and these would get lost.
-  const topFields=['template','playbook','tags','limit','execution_environment','check','diff','verbose','keepExtravars','credentials','inventory','awxCredentials']
+  const topFields=['template','playbook','tags','limit','execution_environment','check','diff','verbose','keepExtravars','credentials','inventory','awxCredentials','ansibleCredentials']
   for (const fieldName of topFields) {
     // Check if the field exists in formObj and if the property is not present in extravars
     if (formObj.hasOwnProperty(fieldName) && extravars[`__${fieldName}__`] === undefined) {
@@ -44,19 +44,26 @@ Exec.executeCommand = (cmd,jobid,counter) => {
   var directory = cmd.directory
   var description = cmd.description
   var extravars = cmd.extravars
+  var hiddenExtravars = cmd.hiddenExtravars
   var extravarsFileName = cmd.extravarsFileName
+  var hiddenExtravarsFileName = cmd.hiddenExtravarsFileName
   var keepExtravars = cmd.keepExtravars
   var task = cmd.task
+
   // execute the procces
   return new Promise((resolve,reject)=>{
     logger.debug(`${description}, ${directory} > ${Helpers.logSafe(command)}`)
     try{
-      
+
 
       if(extravarsFileName){
         logger.debug(`Storing extravars to file ${extravarsFileName}`)
         var filepath=path.join(directory,extravarsFileName)
         fs.writeFileSync(filepath,extravars) 
+
+        logger.debug(`Storing hidden extravars to file ${hiddenExtravarsFileName}`)
+        var he_filepath=path.join(directory,hiddenExtravarsFileName)
+        fs.writeFileSync(he_filepath,hiddenExtravars)         
       }else{
         logger.warning("No filename was given")
       }
@@ -110,6 +117,9 @@ Exec.executeCommand = (cmd,jobid,counter) => {
           logger.debug(`Removing extavars file ${filepath}`)
           fs.unlinkSync(filepath)    
         }
+        if(hiddenExtravarsFileName){
+          fs.unlinkSync(he_filepath) 
+        }
              
       })
       // add error eventlistener to the process; set failed
@@ -906,26 +916,40 @@ Ansible.launch=async (ev,credentials,jobid,counter,approval,approved=false)=>{
   var limit = extravars?.__limit__ || ""
   var keepExtravars = extravars?.__keepExtravars__ || false    
   var diff = extravars?.__diff__ || false  
+  var ansibleCredentials = extravars?.__ansibleCredentials__ || ""  
 
   // merge credentials now
   extravars = {...extravars,...credentials}
   // convert to string for the command
   extravars = JSON.stringify(extravars)
+  // define hiddenExtravars
+  var hiddenExtravars={}
+  if(ansibleCredentials){ 
+    const runCredential = await Credential.findByName(ansibleCredentials)
+    hiddenExtravars.ansible_user = runCredential.user
+    hiddenExtravars.ansible_password = runCredential.password
+  }
+  // convert to string for the command
+  hiddenExtravars = JSON.stringify(hiddenExtravars)  
+
   // make extravars file
   const extravarsFileName = `extravars_${jobid}.json`;
+  const hiddenExtravarsFileName = `he_${extravarsFileName}`
   logger.debug(`Extravars File: ${extravarsFileName}`);
   // prepare my ansible command
 
-  var command = `ansible-playbook -e '@${extravarsFileName}'`
+  var command = `ansible-playbook -e '@${extravarsFileName}' -e '@${hiddenExtravarsFileName}'`
+  
   inventory.forEach((item, i) => {  command += ` -i '${item}'` });
   if(tags){ command += ` -t '${tags}'` }
   if(check){ command += ` --check` }
   if(diff){ command += ` --diff` }
   if(verbose){ command += ` -vvv`}
   if(limit){ command += ` --limit '${limit}'`}
+   
   command += ` ${playbook}`
   var directory = ansibleConfig.path
-  var cmdObj = {directory:directory,command:command,description:"Running playbook",task:"Playbook",extravars:extravars,extravarsFileName:extravarsFileName,keepExtravars:keepExtravars}
+  var cmdObj = {directory:directory,command:command,description:"Running playbook",task:"Playbook",extravars:extravars,hiddenExtravars:hiddenExtravars,extravarsFileName:extravarsFileName,hiddenExtravarsFileName:hiddenExtravarsFileName,keepExtravars:keepExtravars}
 
   logger.notice("Running playbook : " + playbook)
   logger.debug("extravars : " + extravars)
diff --git a/server/src/models/ldap.model.js b/server/src/models/ldap.model.js
index ceffc596..26f2b624 100644
--- a/server/src/models/ldap.model.js
+++ b/server/src/models/ldap.model.js
@@ -96,6 +96,7 @@ Ldap.check = function(ldapConfig){
       logger.notice("Certificates are valid")
       try{
         // logger.debug(JSON.stringify(options))
+        logger.notice("Authenticating")
         var user = await authenticate(options)
         resolve(user)
       }catch(err){
@@ -106,17 +107,21 @@ Ldap.check = function(ldapConfig){
           try{ em = YAML.stringify(err)}catch(e){em = err}
         }
         if(err.admin){
-          if(err.admin.code){
-            em = err
+          if(err.admin.lde_message){
+            try{ em = YAML.stringify(err.admin.lde_message)}catch(e){em = err}
+          }
+          else if(err.admin.code){
+            try{ em = YAML.stringify(err.admin)}catch(e){em = err}
             if(err.admin.code=="UNABLE_TO_VERIFY_LEAF_SIGNATURE"){
               em = "Unable to verify the certificate"
             }else if(err.admin.code==49){
               em = "Wrong binding credentials"
-            }else if(err.admin.code="ENOTFOUND"){
+            }else if(err.admin.code=="ENOTFOUND"){
               em = "Bad server or port (connection failed)"
             }
           }
         }
+        
         if(em.includes("user not found")){
           logger.notice("Checking ldap connection ok")
           resolve()
diff --git a/server/src/swagger.json b/server/src/swagger.json
index f2260c4a..3e2df630 100644
--- a/server/src/swagger.json
+++ b/server/src/swagger.json
@@ -2,7 +2,7 @@
   "swagger": "2.0",
   "info": {
     "description": "This is the swagger interface for AnsibleForms.\r\nUse the `/auth/login` api with basic authentication to obtain a JWT token.\r\nThen use the access token, prefixed with the word '**Bearer**' to use all other api's.\r\nNote that the access token is limited in time.  You can then either login again and get a new set of tokens or use the `/token` api and the refresh token to obtain a new set (preferred).",
-    "version": "4.0.16",
+    "version": "4.0.17",
     "title": "AnsibleForms",
     "contact": {
       "email": "info@ansibleforms.com"