diff --git a/include/functions.php b/include/functions.php
index 4c6983e0..3fc168ce 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1722,6 +1722,13 @@ function get_ip_location($ip)
 	if (isset($locations[$ip])) {
 	    return $locations[$ip];
     }
+    /**
+     * @since 1.7.4
+     */
+	$arr = get_ip_location_from_geoip($ip);
+    $result = array($arr["name"], $lang_functions['text_user_ip'] . ": " . $ip);
+	return $locations[$ip] = $result;
+
 	$cacheKey = "location_$ip";
 	if (!$ret = $Cache->get_value($cacheKey)){
 		$ret = array();
diff --git a/public/edit.php b/public/edit.php
index 46eaf4c6..94dbe01a 100644
--- a/public/edit.php
+++ b/public/edit.php
@@ -174,7 +174,7 @@ else {
             }
 			$pickcontent .= "<b>".$lang_edit['row_torrent_position'].":&nbsp;</b>"."<select name=\"sel_posstate\" style=\"width: 100px;\">" . implode('', $options) . "</select>&nbsp;&nbsp;&nbsp;";
 		}
-		if(get_user_class()>=$torrentmanage_class && $CURUSER["picker"] == 'yes')
+		if(get_user_class()>=$torrentmanage_class && ($CURUSER["picker"] == 'yes' || get_user_class() >= \App\Models\User::CLASS_SYSOP))
 		{
             if ($pickcontent) $pickcontent .= '<br />';
 			$pickcontent .= "<b>".$lang_edit['row_recommended_movie'].":&nbsp;</b>"."<select name=\"sel_recmovie\" style=\"width: 100px;\">" .