diff --git a/src/uk/ac/swansea/eduroamcat/WifiConfigAPI18.java b/src/uk/ac/swansea/eduroamcat/WifiConfigAPI18.java
index 1cf5d58..95f859c 100644
--- a/src/uk/ac/swansea/eduroamcat/WifiConfigAPI18.java
+++ b/src/uk/ac/swansea/eduroamcat/WifiConfigAPI18.java
@@ -237,20 +237,20 @@ else if (aAuth.getInnerNonEAPType()==0) {
 
 			//just identity for TLS
 			if (aAuth.getOuterEAPType()==13) {
-				if (userName!=null)
-				if (userName.length()==0) if ( aAuth.getClientPrivateKeySubjectCN() != null && aAuth.getClientPrivateKeySubjectCN().length()>0) {
-                    userName = aAuth.getClientPrivateKeySubjectCN();
-                    enterpriseConfig.setIdentity(userName);
-                    debug("Using Username:" + userName);
-                }
+				if (userName!=null) {
+					if (userName.length() == 0)
+						if (aAuth.getClientPrivateKeySubjectCN() != null && aAuth.getClientPrivateKeySubjectCN().length() > 0) {
+							userName = aAuth.getClientPrivateKeySubjectCN();
+						}
+				}
                 else
                 {
                     if ( aAuth.getClientPrivateKeySubjectCN() != null && aAuth.getClientPrivateKeySubjectCN().length()>0) {
                         userName = aAuth.getClientPrivateKeySubjectCN();
-                        enterpriseConfig.setIdentity(userName);
-                        debug("Using Username:" + userName);
                     }
                 }
+				enterpriseConfig.setIdentity(userName);
+				debug("Using Username:" + userName);
 			}
 	        
 	        selectedConfig.enterpriseConfig=enterpriseConfig;