diff --git a/lam/templates/profedit/profilemain.php b/lam/templates/profedit/profilemain.php
index ce3a567a..22fca206 100644
--- a/lam/templates/profedit/profilemain.php
+++ b/lam/templates/profedit/profilemain.php
@@ -103,8 +103,12 @@ for ($i = 0; $i < sizeof($profileClasses); $i++) {
 include '../main_header.php';
 
 echo "<h1>" . _('Profile editor') . "</h1>\n";
-echo "<br>\n";
 
+if (isset($_GET['savedSuccessfully'])) {
+	StatusMessage("INFO", _("Profile was saved."), htmlspecialchars($_GET['savedSuccessfully']));
+}
+
+echo "<br>\n";
 echo "<form action=\"profilemain.php\" method=\"post\">\n";
 
 // new profile
diff --git a/lam/templates/profedit/profilepage.php b/lam/templates/profedit/profilepage.php
index 3439114a..6f8feafb 100644
--- a/lam/templates/profedit/profilepage.php
+++ b/lam/templates/profedit/profilepage.php
@@ -66,8 +66,7 @@ if (isset($_POST['abort'])) {
 	exit;
 }
 
-// print header
-include '../main_header.php';
+$errors = array();
 
 // save button was presed
 if (isset($_POST['save'])) {
@@ -104,25 +103,29 @@ if (isset($_POST['save'])) {
 	
 	// check options
 	$errors = checkProfileOptions($_POST['accounttype'], $options);
-	// print error messages if any
-	if (sizeof($errors) > 0) {
-		for ($i = 0; $i < sizeof($errors); $i++) {
-			call_user_func_array('StatusMessage', $errors[$i]);
-		}
-		echo "<br>\n";
-	}
-	else {  // input data is valid, save profile
+	if (sizeof($errors) == 0) {  // input data is valid, save profile
 		// save profile
 		if (saveAccountProfile($options, $_POST['profname'], $_POST['accounttype'])) {
-			echo StatusMessage("INFO", _("Profile was saved."), $_POST['profname']);
-			echo ("<br><p><a href=\"profilemain.php\">" . _("Back to profile editor") . "</a></p>");
-			echo "</body></html>";
+			metaRefresh('profilemain.php?savedSuccessfully=' . $_POST['profname']);
 			exit();
 		}
-		else StatusMessage("ERROR", _("Unable to save profile!"), $_POST['profname']);
+		else {
+			$errors[] = array("ERROR", _("Unable to save profile!"), $_POST['profname']);
+		}
 	}
 }
 
+// print header
+include '../main_header.php';
+
+// print error messages if any
+if (sizeof($errors) > 0) {
+	for ($i = 0; $i < sizeof($errors); $i++) {
+		call_user_func_array('StatusMessage', $errors[$i]);
+	}
+	echo "<br>\n";
+}
+	
 // empty list of attribute types
 $_SESSION['profile_types'] = array();