diff --git a/build/build-cloud-plugins.xml b/build/build-cloud-plugins.xml
index a21a4c3f4f5..fad40908ae4 100755
--- a/build/build-cloud-plugins.xml
+++ b/build/build-cloud-plugins.xml
@@ -236,14 +236,18 @@
 
   <!-- ===================== User Authenticators ================== -->
 
-  <target name="compile-user-authenticators" depends="compile-user-authenticator-ldap" description="Compile all user authenicators"/>
-  <target name="build-user-authenticators" depends="build-user-authenticator-ldap" description="builds all user authenticators"/>
+  <target name="compile-user-authenticators" depends="compile-user-authenticator-ldap, compile-user-authenticator-md5" description="Compile all user authenicators"/>
+  <target name="build-user-authenticators" depends="build-user-authenticator-ldap, build-user-authenticator-md5" description="builds all user authenticators"/>
 
   <target name="compile-user-authenticator-ldap" depends="-init, compile-server" description="Compile ">
   	<ant antfile="${base.dir}/plugins/user-authenticators/ldap/build.xml" target="build"/>
   </target>
   <target name="build-user-authenticator-ldap" depends="compile-user-authenticator-ldap" />
 
+  <target name="compile-user-authenticator-md5" depends="-init, compile-server" description="Compile ">
+  	<ant antfile="${base.dir}/plugins/user-authenticators/md5/build.xml" target="build"/>
+  </target>
+  <target name="build-user-authenticator-md5" depends="compile-user-authenticator-md5" />
 
   <!-- ===================== Network Elements ===================== -->
 
diff --git a/plugins/user-authenticators/md5/.classpath b/plugins/user-authenticators/md5/.classpath
new file mode 100755
index 00000000000..e39771ada09
--- /dev/null
+++ b/plugins/user-authenticators/md5/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/api"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/server"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/utils"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/user-authenticators/md5/.project b/plugins/user-authenticators/md5/.project
new file mode 100755
index 00000000000..2565593397d
--- /dev/null
+++ b/plugins/user-authenticators/md5/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>md5-user-authenticator</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/user-authenticators/md5/build.xml b/plugins/user-authenticators/md5/build.xml
new file mode 100755
index 00000000000..eee2fc70bff
--- /dev/null
+++ b/plugins/user-authenticators/md5/build.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+
+<project name="Cloud Stack LDAP User Authenticator" default="help" basedir=".">
+  <description>
+		Cloud Stack ant build file
+    </description>
+
+  <dirname property="user-authenticator-md5.base.dir" file="${ant.file.Cloud Stack LDAP User Authenticator}/"/>
+  <!-- This directory must be set -->
+  <property name="top.dir" location="${user-authenticator-md5.base.dir}/../../.."/>
+  <property name="build.dir" location="${top.dir}/build"/>
+	
+	<echo message="build.dir=${build.dir}; top.dir=${top.dir}; user-authenticator-md5.base.dir=${user-authenticator-md5.base.dir}"/>
+
+  <!-- Import anything that the user wants to set-->
+  <!-- Import properties files and environment variables here -->
+
+  <property environment="env" />
+
+  <condition property="build-cloud.properties.file" value="${build.dir}/override/build-cloud.properties" else="${build.dir}/build-cloud.properties">
+    <available file="${build.dir}/override/build-cloud.properties" />
+  </condition>
+
+  <condition property="cloud.properties.file" value="${build.dir}/override/cloud.properties" else="${build.dir}/cloud.properties">
+    <available file="${build.dir}/override/cloud.properties" />
+  </condition>
+
+  <condition property="override.file" value="${build.dir}/override/replace.properties" else="${build.dir}/replace.properties">
+    <available file="${build.dir}/override/replace.properties" />
+  </condition>
+
+  <echo message="Using build parameters from ${build-cloud.properties.file}" />
+  <property file="${build-cloud.properties.file}" />
+
+  <echo message="Using company info from ${cloud.properties.file}" />
+  <property file="${cloud.properties.file}" />
+
+  <echo message="Using override file from ${override.file}" />
+  <property file="${override.file}" />
+
+  <property file="${build.dir}/build.number" />
+
+  <!-- In case these didn't get defined in the build-cloud.properties -->
+  <property name="branding.name" value="default" />
+  <property name="deprecation" value="off" />
+  <property name="target.compat.version" value="1.6" />
+  <property name="source.compat.version" value="1.6" />
+  <property name="debug" value="true" />
+  <property name="debuglevel" value="lines,source"/>
+
+  <echo message="target.dir=${target.dir}; top.dir=${top.dir}"/>
+  <!-- directories for build and distribution -->
+  <property name="target.dir" location="${top.dir}/target" />
+  <property name="classes.dir" location="${target.dir}/classes" />
+  <property name="jar.dir" location="${target.dir}/jar" />
+  <property name="dep.cache.dir" location="${target.dir}/dep-cache" />
+  <property name="build.log" location="${target.dir}/ant_verbose.txt" />
+
+  <property name="deps.dir" location="${top.dir}/deps" />
+  
+  <property name="user-authenticator-md5.jar" value="cloud-user-authenticator-md5.jar" />
+  <property name="user-authenticator-md5-scripts.dir" location="${user-authenticator-md5.base.dir}/scripts" />
+	
+  <import file="${build.dir}/build-common.xml"/>
+
+  <echo message="target.dir=${target.dir}; top.dir=${top.dir}"/>
+	
+  <!-- This section needs to be replaced by some kind of dependency library-->
+  <path id="deps.classpath">
+    <!--filelist files="${deps.classpath}" /-->
+    <fileset dir="${deps.dir}" erroronmissingdir="false">
+      <include name="*.jar" />
+    </fileset>
+  </path>
+	
+  <path id="cloudstack.classpath">
+  	<fileset dir="${jar.dir}">
+  	  <include name="*.jar"/>
+    </fileset>
+  </path>
+	
+  <path id="user-authenticator-md5.classpath">
+	<path refid="deps.classpath"/>
+  	<path refid="cloudstack.classpath"/>
+  </path>
+	
+  <!-- This section needs to be replaced by some kind of dependency library-->
+	
+	
+  <target name="init" description="Initialize binaries directory">
+  	<mkdir dir="${classes.dir}/${user-authenticator-md5.jar}"/>
+  	<mkdir dir="${jar.dir}"/>
+  </target>
+	
+  <target name="compile-user-authenticator-md5" depends="init" description="Compile user-authenticator-md5">
+    <compile-java jar.name="${user-authenticator-md5.jar}" top.dir="${user-authenticator-md5.base.dir}" classpath="user-authenticator-md5.classpath" />
+  </target>
+	
+  <target name="help" description="help">
+    <echo level="info" message="This is the build file for user-authenticator-md5"/>
+    <echo level="info" message="You can do a build by doing ant build or clean by ant clean" />
+  </target>
+
+  <target name="clean-user-authenticator-md5">
+    <delete dir="${classes.dir}/${user-authenticator-md5.jar}"/>
+  </target>
+	
+  <target name="build" depends="compile-user-authenticator-md5"/>
+  <target name="clean" depends="clean-user-authenticator-md5"/>
+	
+</project>
diff --git a/server/src/com/cloud/server/auth/MD5UserAuthenticator.java b/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java
similarity index 100%
rename from server/src/com/cloud/server/auth/MD5UserAuthenticator.java
rename to plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java