diff --git a/runtime/src/main/java/org/teiid/runtime/EmbeddedConfiguration.java b/runtime/src/main/java/org/teiid/runtime/EmbeddedConfiguration.java
index 13d45f98e5..1096b862b7 100644
--- a/runtime/src/main/java/org/teiid/runtime/EmbeddedConfiguration.java
+++ b/runtime/src/main/java/org/teiid/runtime/EmbeddedConfiguration.java
@@ -38,6 +38,7 @@
 import org.teiid.dqp.internal.process.DefaultAuthorizationValidator;
 import org.teiid.dqp.internal.process.TeiidExecutor;
 import org.teiid.dqp.internal.process.ThreadReuseExecutor;
+import org.teiid.net.socket.AuthenticationType;
 import org.teiid.query.ObjectReplicator;
 import org.teiid.security.SecurityHelper;
 import org.teiid.transport.SocketConfiguration;
@@ -74,6 +75,7 @@ public class EmbeddedConfiguration extends DQPConfiguration {
 	private int memoryBufferSpace ;
 	
 	private DefaultCacheManager manager;
+	private AuthenticationType authenticationType;
 	
 	public EmbeddedConfiguration() {
 		processorBatchSize = -1;
@@ -323,4 +325,12 @@ public int getMemoryBufferSpace() {
 	public void setMemoryBufferSpace(int memoryBufferSpace) {
 		this.memoryBufferSpace = memoryBufferSpace;
 	}
+	
+	public AuthenticationType getAuthenticationType() {
+		return this.authenticationType;
+	}
+	
+	public void setAuthenticationType(AuthenticationType authenticationType) {
+		this.authenticationType = authenticationType;
+	}
 }
diff --git a/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java b/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java
index 2047123a68..61c4c90045 100644
--- a/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java
+++ b/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java
@@ -396,6 +396,9 @@ public Object invoke(Object proxy, Method method, Object[] args)
 		this.dqp.start(config);
 		this.sessionService.setDqp(this.dqp);
 		this.services.setSecurityHelper(this.sessionService.getSecurityHelper());
+		if (this.config.getAuthenticationType() != null) {
+			this.services.setAuthenticationType(this.config.getAuthenticationType());
+		}
 		this.services.setVDBRepository(this.repo);
 		this.materializationMgr = getMaterializationManager();
 		this.repo.addListener(this.materializationMgr);