diff --git a/src/ckpmsg.c b/src/ckpmsg.c
index 206b9056..c585192d 100644
--- a/src/ckpmsg.c
+++ b/src/ckpmsg.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Con Kolivas
+ * Copyright 2014-2018 Con Kolivas
  * Copyright 2014-2016 Andrew Smith
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -16,6 +16,7 @@
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
+#include <ctype.h>
 
 #include "libckpool.h"
 #include "utlist.h"
diff --git a/src/stratifier.c b/src/stratifier.c
index 9e25b837..2dcdfc5d 100644
--- a/src/stratifier.c
+++ b/src/stratifier.c
@@ -5343,7 +5343,7 @@ static user_instance_t *generate_user(ckpool_t *ckp, stratum_instance_t *client,
 	ck_wunlock(&sdata->instance_lock);
 
 	/* Is this a btc address based username? */
-	if (!ckp->proxy && (new_user || !user->btcaddress) && (len > 26 && len < 35))
+	if (!ckp->proxy && (new_user || !user->btcaddress))
 		user->btcaddress = generator_checkaddr(ckp, username, &user->script, &user->segwit);
 	if (new_user) {
 		LOGNOTICE("Added new user %s%s", username, user->btcaddress ?