diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index 6660dd5cd..04831ed40 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -644,11 +644,14 @@ var InternalClient = (function () {
 				return;
 			}
 
-			options = options || {};
-			options.max_age = options.maxAge || 0;
-			options.max_uses = options.maxUses || 0;
-			options.temporary = options.temporary || false;
-			options.xkcdpass = options.xkcd || false;
+			if (!options) {
+				options = { validate: null };
+			} else {
+				options.max_age = options.maxAge || 0;
+				options.max_uses = options.maxUses || 0;
+				options.temporary = options.temporary || false;
+				options.xkcdpass = options.xkcd || false;
+			}
 
 			var epoint;
 			if (chanServ instanceof Channel) {
diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js
index 4f8ef69cf..93a55bf17 100644
--- a/src/Client/InternalClient.js
+++ b/src/Client/InternalClient.js
@@ -684,11 +684,14 @@ class InternalClient {
 				return;
 			}
 			
-			options = options || {};
-			options.max_age = options.maxAge || 0;
-			options.max_uses = options.maxUses || 0;
-			options.temporary = options.temporary || false;
-			options.xkcdpass = options.xkcd || false;
+			if(!options){
+				options = {validate:null};
+			}else{
+				options.max_age = options.maxAge || 0;
+				options.max_uses = options.maxUses || 0;
+				options.temporary = options.temporary || false;
+				options.xkcdpass = options.xkcd || false;
+			}
 			
 			var epoint;
 			if(chanServ instanceof Channel){