diff --git a/oam/install_scripts/module_installer.sh b/oam/install_scripts/module_installer.sh
index 01297a64f..764a8beb1 100755
--- a/oam/install_scripts/module_installer.sh
+++ b/oam/install_scripts/module_installer.sh
@@ -152,6 +152,14 @@ if test -f $INFINIDB_INSTALL_DIR/mysql/my.cnf ; then
 	$INFINIDB_INSTALL_DIR/bin/mycnfUpgrade $mysqlPort > /tmp/mycnfUpgrade_port.log 2>&1
 fi
 
+# if um, run mysql install scripts
+if [ $module = "um" ]; then
+	echo "Run post-mysqld-install"
+	$INFINIDB_INSTALL_DIR/bin/post-mysqld-install > /tmp/post-mysqld-install.log 2>&1
+	echo "Run post-mysql-install"
+	$INFINIDB_INSTALL_DIR/bin/post-mysql-install > /tmp/post-mysql-install.log 2>&1
+fi
+
 
 echo " "
 echo "!!!Module Installation Successfully Completed!!!"
diff --git a/oam/install_scripts/user_installer.sh b/oam/install_scripts/user_installer.sh
index 0c0dd20d5..f1ec1226c 100644
--- a/oam/install_scripts/user_installer.sh
+++ b/oam/install_scripts/user_installer.sh
@@ -281,7 +281,7 @@ if { $INSTALLTYPE == "initial"} {
 			"passphrase" { send "$PASSWORD\n" }
 		}
 	}
-	set timeout 30
+	set timeout 200
 	expect {
 		"!!!Module" 	{ send_user "DONE" }
 		"FAILED"   	{ send_user "ERROR: missing OS file\n" ; exit 1 }
@@ -290,44 +290,6 @@ if { $INSTALLTYPE == "initial"} {
 	}
 	send_user "\n"
 	set timeout 30
-	expect -re {[$#] }
-	#
-	# run mysql setup scripts
-	#
-	send_user "Run MySQL Setup Scripts on Module               "
-	send "ssh $USERNAME@$SERVER '$BASH $INSTALLDIR/bin/post-mysqld-install'\n"
-	if { $PASSWORD != "ssh" } {
-		set timeout 60
-		expect {
-			"word: " { send "$PASSWORD\n" }
-			"passphrase" { send "$PASSWORD\n" }
-		}
-	}
-	set timeout 60
-	expect {
-		"Connection closed"   { send_user "ERROR: Connection closed\n" ; exit 1 }
-	}
-	set timeout 30
-	expect -re {[$#] }
-	#
-	send "ssh $USERNAME@$SERVER '$BASH $INSTALLDIR/bin/post-mysql-install $MYSQLPW'\n"
-	if { $PASSWORD != "ssh" } {
-		set timeout 30
-		expect {
-			"word: " { send "$PASSWORD\n" }
-			"passphrase" { send "$PASSWORD\n" }
-		}
-	}
-	set timeout 60
-	expect {
-		"Shutting down mysql." { send_user "DONE" }
-		-re {[$#] } 	{ send_user "DONE" }
-		timeout { send_user "DONE" }
-		"Connection closed"   { send_user "ERROR: Connection closed\n" ; exit 1 }
-		"ERROR" { send_user "ERROR: Check mysql logs and /tmp/mysql_install.log\n" ; exit 1 }
-	}
-	send_user "\n"
-	set timeout 30
 	#expect -re {[$#] }
 }