diff --git a/bower.json b/bower.json
index 3f67cc0..f7634a3 100644
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "strolch-wc-auth",
   "description": "Strolch WebComponent Auth",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "authors": ["Robert von Burg"],
   "keywords": [
     "strolch",
diff --git a/strolch-wc-auth.html b/strolch-wc-auth.html
index c72e654..20cdc31 100644
--- a/strolch-wc-auth.html
+++ b/strolch-wc-auth.html
@@ -78,9 +78,12 @@
                         </template>
 
                         <template is="dom-if" if="[[showVersion]]">
-                            <template is="dom-if" if="[[appVersion]]">
+                            <template is="dom-if" if="[[showAppVersion]]">
                                 <p>[[appName]] [[appVersion]] @ [[_getEnv(environment)]]</p>
                             </template>
+                            <template is="dom-if" if="[[showAppEnvironment]]">
+                                <p>[[appName]] @ [[_getEnv(environment)]]</p>
+                            </template>
                         </template>
 
                     </div>
@@ -215,9 +218,7 @@
             properties: {
                 basePath: {
                     type: String,
-                    value: function () {
-                        return './';
-                    }
+                    value: './'
                 },
                 localesPath: {
                     type: String,
@@ -234,11 +235,21 @@
                     type: Boolean,
                     value: false
                 },
+                showAppVersion: {
+                    type: Boolean,
+                    value: false
+                },
+                showAppEnvironment: {
+                    type: Boolean,
+                    value: false
+                },
                 appVersion: {
-                    type: String
+                    type: String,
+                    value: null
                 },
                 environment: {
-                    type: String
+                    type: String,
+                    value: null
                 },
                 username: {
                     type: String
@@ -268,6 +279,13 @@
                 }
             },
 
+            computeShowAppVersion: function (appVersion, environment) {
+                return appVersion != null && environment != null;
+            },
+            computeShowAppEnvironment: function (appVersion, environment) {
+                return appVersion == null && environment != null;
+            },
+
             ready: function () {
                 // do nothing
             },
@@ -579,6 +597,8 @@
                 this.appName = version.agentVersion.agentName;
                 this.appVersion = version.appVersion.artifactVersion;
                 this.environment = version.agentVersion.environment;
+                this.showAppVersion = this.computeShowAppVersion(this.appVersion, this.environment)
+                this.showAppEnvironment = this.computeShowAppEnvironment(this.appVersion, this.environment)
                 Strolch.setAppVersion(version);
                 sessionStorage.setItem("strolchAppVersion", JSON.stringify(version));
             },
@@ -589,6 +609,9 @@
                 console.log("Ignoring get version error due to readyState: " + readyState + " / status: " + status);
             },
             _getEnv: function (environment) {
+                console.log("environment=" + environment)
+                if (environment == null)
+                    return "-";
                 if (environment.indexOf('prod') >= 0) {
                     return this.localize('production');
                 } else if (environment.indexOf('test') >= 0) {