diff --git a/lam/templates/config/profmanage.php b/lam/templates/config/profmanage.php
index 53afd006..3bdc4faa 100644
--- a/lam/templates/config/profmanage.php
+++ b/lam/templates/config/profmanage.php
@@ -51,7 +51,7 @@ echo $_SESSION['header'];
 		</p>
 		<hr><br>
 
-<?
+<?php
 
 // check if submit button was pressed
 if ($_POST['submit']) {
diff --git a/lam/templates/main_header.php b/lam/templates/main_header.php
index 876b5d89..2c110b0d 100644
--- a/lam/templates/main_header.php
+++ b/lam/templates/main_header.php
@@ -45,7 +45,7 @@ echo $_SESSION['header'];
 <table border=0 width="100%">
 	<tr>
     	<td width="100" align="left"><a href="./profedit/profilemain.php" target="mainpart"><?php echo _("Profile Editor"); ?></a></td>
-		<?
+		<?php
 			// Samba 3 has more list views
 			if ($_SESSION['config']->get_samba3() == "yes") echo "<td rowspan=3 colspan=4 align=\"center\">\n";
 			else echo "<td rowspan=3 colspan=3 align=\"center\">\n";
@@ -62,7 +62,7 @@ echo $_SESSION['header'];
     	<td align="left"><a href="masscreate.php" target="mainpart"><?php echo _("File Upload") ?></a></td>
 	</tr>
 	<tr>
-		<?
+		<?php
 			// Samba 3 has more list views
 			if ($_SESSION['config']->get_samba3() == "yes") echo "<td colspan=6>&nbsp;</td>\n";
 			else echo "<td colspan=5>&nbsp;</td>\n";
@@ -70,7 +70,7 @@ echo $_SESSION['header'];
 	</tr>
 	<tr>
 		<td></td>
-		<?
+		<?php
 			// Samba 3 has more list views
 			if ($_SESSION['config']->get_samba3() == "yes") {
 				echo '<td width="120" align="center"><a href="./lists/listdomains.php" target="mainpart">' . _("Domains") . '</a></td>' . "\n";
diff --git a/lam/templates/profedit/profilemain.php b/lam/templates/profedit/profilemain.php
index ecad06e3..a539f79a 100644
--- a/lam/templates/profedit/profilemain.php
+++ b/lam/templates/profedit/profilemain.php
@@ -104,7 +104,7 @@ echo $_SESSION['header'];
 		<!-- user profile options -->
 		<fieldset>
 			<legend>
-				<b><? echo _("User Profiles"); ?></b>
+				<b><?php echo _("User Profiles"); ?></b>
 			</legend>
 			<table border=0>
 				<!-- new user profile -->
@@ -112,7 +112,7 @@ echo $_SESSION['header'];
 					<td>
 						<input type="radio" name="profile" value="newuser" checked>
 					</td>
-					<td colspan=2><? echo _("Create a new User Profile"); ?></td>
+					<td colspan=2><?php echo _("Create a new User Profile"); ?></td>
 				</tr>
 				<!-- edit user profile -->
 				<tr>
@@ -121,10 +121,10 @@ echo $_SESSION['header'];
 					</td>
 					<td>
 						<select name="e_user" size=1>
-							<? echo $userprofiles ?>
+							<?php echo $userprofiles ?>
 						</select>
 					</td>
-					<td><? echo _("Edit User Profile"); ?></td>
+					<td><?php echo _("Edit User Profile"); ?></td>
 				</tr>
 				<!-- delete user profile -->
 				<tr>
@@ -133,10 +133,10 @@ echo $_SESSION['header'];
 					</td>
 					<td>
 						<select name="d_user" size=1>
-							<? echo $userprofiles ?>
+							<?php echo $userprofiles ?>
 						</select>
 					</td>
-					<td><? echo _("Delete User Profile"); ?></td>
+					<td><?php echo _("Delete User Profile"); ?></td>
 				</tr>
 			</table>
 		</fieldset>
@@ -146,7 +146,7 @@ echo $_SESSION['header'];
 		<!-- host profile options -->
 		<fieldset>
 			<legend>
-				<b><? echo _("Samba Host Profiles"); ?></b>
+				<b><?php echo _("Samba Host Profiles"); ?></b>
 			</legend>
 			<table border=0>
 				<!-- new host profile -->
@@ -154,7 +154,7 @@ echo $_SESSION['header'];
 					<td>
 						<input type="radio" name="profile" value="newhost">
 					</td>
-					<td colspan=2><? echo _("Create a new Samba Host Profile"); ?></td>
+					<td colspan=2><?php echo _("Create a new Samba Host Profile"); ?></td>
 				</tr>
 				<!-- edit host profile -->
 				<tr>
@@ -163,10 +163,10 @@ echo $_SESSION['header'];
 					</td>
 					<td>
 						<select name="e_host" size=1>
-							<? echo $hostprofiles ?>
+							<?php echo $hostprofiles ?>
 						</select>
 					</td>
-					<td><? echo _("Edit Samba Host Profile"); ?></td>
+					<td><?php echo _("Edit Samba Host Profile"); ?></td>
 				</tr>
 				<!-- delete host profile -->
 				<tr>
@@ -175,10 +175,10 @@ echo $_SESSION['header'];
 					</td>
 					<td>
 						<select name="d_host" size=1>
-							<? echo $hostprofiles ?>
+							<?php echo $hostprofiles ?>
 						</select>
 					</td>
-					<td><? echo _("Delete Samba Host Profile"); ?></td>
+					<td><?php echo _("Delete Samba Host Profile"); ?></td>
 				</tr>
 			</table>
 		</fieldset>
@@ -189,8 +189,8 @@ echo $_SESSION['header'];
 		<p>
 		<input type="hidden" name="forward" value="yes">
 
-		<input type="submit" name="submit" value="<? echo _("Submit"); ?>">
-		<input type="submit" name="abort" value="<? echo _("Abort"); ?>">
+		<input type="submit" name="submit" value="<?php echo _("Submit"); ?>">
+		<input type="submit" name="abort" value="<?php echo _("Abort"); ?>">
 		</p>
 
 		</form>
diff --git a/lam/tests/ldap-test.php b/lam/tests/ldap-test.php
index 124687e6..f5c0b3b7 100644
--- a/lam/tests/ldap-test.php
+++ b/lam/tests/ldap-test.php
@@ -54,7 +54,7 @@ else {
 <html>
 	<head>
 		<title>
-		<?
+		<?php
 		echo ("Login");
 		?>
 		</title>