diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi10a.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi10a.java
index d3e58c10..d5c2654b 100644
--- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi10a.java
+++ b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi10a.java
@@ -4,7 +4,7 @@ import org.maxkey.client.oauth.model.Token;
 
 public class MaxkeyApi10a extends DefaultApi10a
 {
-	private static final String DEFAULT_WEB_URL = "https://sso.maxkey.org/maxkey";
+	private static final String DEFAULT_WEB_URL = "https://sso.maxkey.top/maxkey";
 	private static final String AUTHORIZATION_URL = DEFAULT_WEB_URL+"/oauth/v10a/authz?oauth_token=%s";
   
   public MaxkeyApi10a() {
diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi20.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi20.java
index a53e5e0d..6c6e1617 100644
--- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi20.java
+++ b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi20.java
@@ -9,7 +9,7 @@ import org.maxkey.client.utils.Preconditions;
 
 public class MaxkeyApi20 extends DefaultApi20 {
 	//approval_prompt:force or auto
-	private static final String DEFAULT_WEB_URL = "https://sso.maxkey.org/maxkey";
+	private static final String DEFAULT_WEB_URL = "https://sso.maxkey.top/maxkey";
 	
 	private static final String AUTHORIZATION_URL = "%s/oauth/v20/authorize?client_id=%s&response_type=code&redirect_uri=%s&approval_prompt=auto";
     
diff --git a/maxkey-web-manage/src/main/resources/maxkey.properties b/maxkey-web-manage/src/main/resources/maxkey.properties
index 88d20d58..f1594aaa 100644
--- a/maxkey-web-manage/src/main/resources/maxkey.properties
+++ b/maxkey-web-manage/src/main/resources/maxkey.properties
@@ -2,7 +2,7 @@
 #                        MaxKey Management
 ############################################################################
 #                domain name configuration
-config.server.domain=maxkey.org
+config.server.domain=maxkey.top
 config.server.domain.sub=sso.${config.server.domain}
 config.server.name=http://${config.server.domain.sub}
 config.server.prefix.uri=${config.server.name}:9521/maxkey-mgt
@@ -50,10 +50,10 @@ config.saml.v20.idp.keystore.password=maxkey
 config.saml.v20.idp.keystore.private.key.password=maxkey
 config.saml.v20.idp.keystore=classpath\:config/samlServerKeystore.jks
 #keystore id for sec
-config.saml.v20.idp.issuing.entity.id=maxkey.org
-config.saml.v20.idp.issuer=https://sso.maxkey.org/maxkey/saml
+config.saml.v20.idp.issuing.entity.id=maxkey.top
+config.saml.v20.idp.issuer=https://sso.maxkey.top/maxkey/saml
  
-config.saml.v20.idp.receiver.endpoint=https\://sso.maxkey.org/
+config.saml.v20.idp.receiver.endpoint=https\://sso.maxkey.top/
 
 #saml sp keystore
 config.saml.v20.sp.keystore.password=maxkey
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl
index db42c43e..3222a0d5 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl
@@ -212,7 +212,6 @@ $(function(){
 				</tr>
 				<tr>
 					<td colspan =4>
-						<input class="button"  id="status" type="hidden" name="status"  value="1"/>
 			    		<input class="button btn btn-primary mr-3"  id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
 						<input class="button btn btn-secondary mr-3"  id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>	
 					</td>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl
index 0dcc49ba..77f31635 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl
@@ -148,7 +148,6 @@ $(function(){
 								</tr>
 								<tr>
 									<td colspan =4>
-										<input class="button"  id="status" type="hidden" name="status"  value="1"/>
 							    		<input class="button btn btn-primary mr-3"  id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
 										<input class="button btn btn-secondary mr-3"  id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>	
 									</td>
diff --git a/maxkey-web-maxkey/src/main/resources/maxkey.properties b/maxkey-web-maxkey/src/main/resources/maxkey.properties
index f56731a6..14c2148b 100644
--- a/maxkey-web-maxkey/src/main/resources/maxkey.properties
+++ b/maxkey-web-maxkey/src/main/resources/maxkey.properties
@@ -2,7 +2,7 @@
 #                        MaxKey
 ############################################################################
 #                domain name configuration
-config.server.domain=maxkey.org
+config.server.domain=maxkey.top
 config.server.domain.sub=sso.${config.server.domain}
 config.server.name=http://${config.server.domain.sub}
 config.server.prefix.uri=${config.server.name}/maxkey
@@ -77,7 +77,7 @@ config.support.kerberos.default.fulluserdomain=MAXKEY.ORG
 #last 8Bit crypto for Kerberos web Authentication 
 config.support.kerberos.default.crypto=846KZSzYq56M6d5o
 #Kerberos Authentication server RUL
-config.support.kerberos.default.redirecturi=http://sso.maxkey.org/kerberos/authn/
+config.support.kerberos.default.redirecturi=http://sso.maxkey.top/kerberos/authn/
 ############################################################################ 
 #                HTTPHEADER Login configuration
 ############################################################################
@@ -103,14 +103,14 @@ config.support.basic.enable=false
 #signingCertificate: ADFS's signing certificate used to validate the token/assertions issued by ADFS.
 ############################################################################
 
-config.support.wsfederation.identifier=http://adfs.maxkey.org/adfs/services/trust
-config.support.wsfederation.url=https://adfs.maxkey.org/adfs/ls/
+config.support.wsfederation.identifier=http://adfs.maxkey.top/adfs/services/trust
+config.support.wsfederation.url=https://adfs.maxkey.top/adfs/ls/
 config.support.wsfederation.principal=upn
 config.support.wsfederation.relyingParty=urn:federation:connsec
 config.support.wsfederation.signingCertificate=adfs-signing.crt
 config.support.wsfederation.tolerance=10000
 config.support.wsfederation.upn.suffix=maxkey.org
-config.support.wsfederation.logoutUrl=https://adfs.maxkey.org/adfs/ls/?wa=wsignout1.0
+config.support.wsfederation.logoutUrl=https://adfs.maxkey.top/adfs/ls/?wa=wsignout1.0
 #############################################################################
 
 #############################################################################
@@ -135,10 +135,10 @@ config.saml.v20.idp.keystore.password=maxkey
 config.saml.v20.idp.keystore.private.key.password=maxkey
 config.saml.v20.idp.keystore=classpath\:config/samlServerKeystore.jks
 #keystore id for sec
-config.saml.v20.idp.issuing.entity.id=maxkey.org
-config.saml.v20.idp.issuer=https://sso.maxkey.org/maxkey/saml
+config.saml.v20.idp.issuing.entity.id=maxkey.top
+config.saml.v20.idp.issuer=https://sso.maxkey.top/maxkey/saml
  
-config.saml.v20.idp.receiver.endpoint=https\://sso.maxkey.org/
+config.saml.v20.idp.receiver.endpoint=https\://sso.maxkey.top/
 
 #saml sp keystore
 config.saml.v20.sp.keystore.password=maxkey