diff --git a/mod/admin.php b/mod/admin.php
index 2d1d21bb47..318858275b 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -355,7 +355,7 @@ function admin_page_site_post(&$a){
 		set_config('system','directory_submit_url', $global_directory);
 	}
 	set_config('system','thread_allow', $thread_allow);
-	set_config('system','newuser_private', $newuser_private;
+	set_config('system','newuser_private', $newuser_private);
 
 	set_config('system','block_extended_register', $no_multi_reg);
 	set_config('system','no_openid', $no_openid);
diff --git a/mod/parse_url.php b/mod/parse_url.php
index 083a39b55f..9adee8f65c 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -307,16 +307,26 @@ function parse_url_content(&$a) {
 
 	$image = "";
 
-        if(sizeof($siteinfo["images"]) > 0){
-            /*
-              Execute below code only if image is present in siteinfo
-             */
-            foreach ($siteinfo["images"] as $imagedata)
-		if($textmode)
-                    $image .= '[img='.$imagedata["width"].'x'.$imagedata["height"].']'.$imagedata["src"].'[/img]';
+	if(sizeof($siteinfo["images"]) > 0){
+		/* Execute below code only if image is present in siteinfo */
+
+		$total_images = 0;
+		$max_images = get_config('system','max_bookmark_images');
+		if($max_images === false)
+			$max_images = 2;
 		else
-                    $image .= '<img height="'.$imagedata["height"].'" width="'.$imagedata["width"].'" src="'.$imagedata["src"].'" alt="photo" />';
+			$max_images = intval($max_images);
+
+		foreach ($siteinfo["images"] as $imagedata) {
+			if($textmode)
+				$image .= '[img='.$imagedata["width"].'x'.$imagedata["height"].']'.$imagedata["src"].'[/img]' . "\n";
+			else
+				$image .= '<img height="'.$imagedata["height"].'" width="'.$imagedata["width"].'" src="'.$imagedata["src"].'" alt="photo" /><br />';
+			$total_images ++;
+			if($max_images && $max_images >= $total_images)
+				break;
         }
+	}
 
 	if(strlen($text)) {
 		if($textmode)