Index: src/java/com/eviware/soapui/impl/wsdl/support/wss/entries/AddUsernameEntry.java
===================================================================
--- src/java/com/eviware/soapui/impl/wsdl/support/wss/entries/AddUsernameEntry.java	(revision 3993)
+++ src/java/com/eviware/soapui/impl/wsdl/support/wss/entries/AddUsernameEntry.java	(working copy)
@@ -39,6 +39,8 @@
 	private static final String PASSWORD_DIGEST = "PasswordDigest";
 
 	private static final String PASSWORD_TEXT = "PasswordText";
+	
+	private static final String NO_PASSWORD = "NoPassword";
 
 	public static final String TYPE = "Username";
 
@@ -66,6 +68,9 @@
 				token.setPasswordType( WSConstants.PASSWORD_TEXT );
 			else if( passwordType.equals( PASSWORD_DIGEST ) || passwordType.equals( PASSWORD_DIGEST_EXT ) )
 				token.setPasswordType( WSConstants.PASSWORD_DIGEST );
+			else if (passwordType.equals( NO_PASSWORD )) {
+				token.setPasswordType(null);
+			}
 		}
 
 		String password = context.expand( getPassword() );
@@ -102,7 +107,7 @@
 		form.appendCheckBox( "addCreated", "Add Created", "Adds a created" );
 
 		form.appendComboBox( "passwordType", "Password Type", new String[] { PASSWORD_TEXT, PASSWORD_DIGEST,
-				PASSWORD_DIGEST_EXT }, "The password type to generate" );
+				PASSWORD_DIGEST_EXT, NO_PASSWORD }, "The password type to generate" );
 
 		return form.getPanel();
 	}