diff --git a/extensions/m_opme.c b/extensions/m_opme.c
index c60a06a..87d6cc8 100644
--- a/extensions/m_opme.c
+++ b/extensions/m_opme.c
@@ -75,7 +75,7 @@ mo_opme(struct Client *client_p, struct Client *source_p, int parc, const char *
 	{
 		msptr = ptr->data;
 
-		if(is_chanop(msptr) || is_admin(msptr))
+		if(is_chanop(msptr) || is_admin(msptr) || is_owner(msptr))
 		{
 			sendto_one_notice(source_p, ":%s Channel is not opless", parv[1]);
 			return 0;
diff --git a/src/s_user.c b/src/s_user.c
index fef0001..0b3afec 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -1540,6 +1540,13 @@ change_nick_user_host(struct Client *target_p,	const char *nick, const char *use
 			chptr = mscptr->chptr;
 			mptr = mode;
 
+            if(is_owner(mscptr))
+            {
+                *mptr++ = 'y';
+                strcat(modeval, nick);
+                strcat(modeval, " ");
+            }
+
 			if(is_admin(mscptr))
 			{
 				*mptr++ = 'a';