diff --git a/jorobo.dist.ini b/jorobo.dist.ini
index b157b82..55820cb 100644
--- a/jorobo.dist.ini
+++ b/jorobo.dist.ini
@@ -1,5 +1,5 @@
 extension = weblinks
-version = 3.7.0
+version = 3.9.0-rc1
 source = src
 target = package
 
diff --git a/src/administrator/components/com_weblinks/models/weblink.php b/src/administrator/components/com_weblinks/models/weblink.php
index cb238fb..2830045 100644
--- a/src/administrator/components/com_weblinks/models/weblink.php
+++ b/src/administrator/components/com_weblinks/models/weblink.php
@@ -155,6 +155,12 @@ class WeblinksModelWeblink extends JModelAdmin
 			$form->setFieldAttribute('publish_down', 'filter', 'unset');
 		}
 
+		// Don't allow to change the created_by user if not allowed to access com_users.
+		if (!JFactory::getUser()->authorise('core.manage', 'com_users'))
+		{
+			$form->setFieldAttribute('created_by', 'filter', 'unset');
+		}
+
 		return $form;
 	}
 
diff --git a/src/plugins/editors-xtd/weblink/weblink.xml b/src/plugins/editors-xtd/weblink/weblink.xml
index 29c425a..f1b2f37 100644
--- a/src/plugins/editors-xtd/weblink/weblink.xml
+++ b/src/plugins/editors-xtd/weblink/weblink.xml
@@ -7,7 +7,7 @@
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<version>3.7.0</version>
+	<version>##VERSION##</version>
 	<description>PLG_EDITORS-XTD_WEBLINK_XML_DESCRIPTION</description>
 	<files>
 		##FILES##