diff --git a/diaspora/Diaspora_Connection.php b/diaspora/Diaspora_Connection.php
index 67bc63df0..a33bf6089 100644
--- a/diaspora/Diaspora_Connection.php
+++ b/diaspora/Diaspora_Connection.php
@@ -46,7 +46,11 @@ class Diaspora_Connection {
 	public function setDiasporaID($id) {
 		$parts = explode('@', $id);
 		$this->user = $parts[0];
-		$this->host = $parts[1];
+		if (count($parts) > 1) {
+			$this->host = $parts[1];
+		} else {
+			$this->host = '';
+		}
 	}
 
 	public function getDiasporaID() {
diff --git a/irc/irc.php b/irc/irc.php
index eab755c8e..aa727e2ee 100644
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -6,6 +6,7 @@
 * Author: tony baldwin <https://free-haven.org/profile/tony>
 * Author: Tobias Diekershoff <https://f.diekershoff.de/u/tobias>
 */
+
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
@@ -51,13 +52,17 @@ function irc_addon_settings(&$a,&$s) {
 
 }
 
-function irc_addon_settings_post(&$a,&$b) {
-	if(! local_user())
+function irc_addon_settings_post(&$a, &$b) {
+	if(!local_user())
 		return;
 
-	if($_POST['irc-submit']) {
-		PConfig::set( local_user(), 'irc','autochans',trim($_POST['autochans']));
-		PConfig::set( local_user(), 'irc','sitechats',trim($_POST['sitechats']));
+	if(!empty($_POST['irc-submit'])) {
+		if (isset($_POST['autochans'])) {
+			PConfig::set(local_user(), 'irc', 'autochans', trim(($_POST['autochans'])));
+		}
+		if (isset($_POST['sitechats'])) {
+			PConfig::set(local_user(), 'irc', 'sitechats', trim($_POST['sitechats']));
+		}
 		/* upid pop-up thing */
 		info(L10n::t('IRC settings saved.') . EOL);
 	}
diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
index 2ec925094..922f557c4 100644
--- a/pageheader/pageheader.php
+++ b/pageheader/pageheader.php
@@ -7,7 +7,7 @@
  *         Hauke Altmann <https://snarl.de/profile/tugelblend>
  * 
  */
-use Friendica\Core\Addon;
+
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
@@ -61,13 +61,15 @@ function pageheader_addon_settings(&$a,&$s) {
 
 }
 
-function pageheader_addon_settings_post(&$a,&$b) {
+function pageheader_addon_settings_post(&$a, &$b) {
 
-	if(! is_site_admin())
+	if(!is_site_admin())
 		return;
 
-	if($_POST['pageheader-submit']) {
-		Config::set('pageheader','text',trim(strip_tags($_POST['pageheader-words'])));
+	if(!empty($_POST['pageheader-submit'])) {
+		if (isset($_POST['pageheader-words'])) {
+			Config::set('pageheader', 'text', trim(strip_tags($_POST['pageheader-words'])));
+		}
 		info(L10n::t('pageheader Settings saved.') . EOL);
 	}
 }