diff --git a/pool/page_settings.php b/pool/page_settings.php
index da99a97b..852e3f1a 100644
--- a/pool/page_settings.php
+++ b/pool/page_settings.php
@@ -18,7 +18,7 @@ function settings($data, $user, $email, $addr, $err)
  $pg .= '<tr class=dc><td class=dr>';
  $pg .= 'EMail:';
  $pg .= '</td><td class=dl>';
- $pg .= "<input type=text name=email value='".sq($email)."' size=20>";
+ $pg .= "<input type=text name=email value='$email' size=20>";
  $pg .= '</td></tr>';
  $pg .= '<tr class=dc><td class=dr>';
  $pg .= 'Password:';
@@ -41,7 +41,7 @@ function settings($data, $user, $email, $addr, $err)
  $pg .= '<tr class=dc><td class=dr>';
  $pg .= 'BTC Address:';
  $pg .= '</td><td class=dl>';
- $pg .= "<input type=text name=baddr value='".sq($addr)."' size=42>";
+ $pg .= "<input type=text name=baddr value='$addr' size=42>";
  $pg .= '</td></tr>';
  $pg .= '<tr class=dc><td class=dr>';
  $pg .= 'Password:';
diff --git a/pool/page_workmgt.php b/pool/page_workmgt.php
index df6e8cfe..4cea1569 100644
--- a/pool/page_workmgt.php
+++ b/pool/page_workmgt.php
@@ -30,7 +30,7 @@ function workmgtuser($data, $user, $err)
 		$pg .= "<tr class=$row>";
 
 		$wn = htmlspecialchars($ans['workername:'.$i]);
-		$wnv = sq($ans['workername:'.$i]);
+		$wnv = urlencode($ans['workername:'.$i]);
 		$pg .= '<td class=dl>';
 		$pg .= "<input type=hidden name='workername:$i' value='$wnv'>";
 		$pg .= $wn.'</td>';
@@ -67,7 +67,7 @@ function doworkmgt($data, $user)
 		$settings = array();
 		for ($i = 0; $i < $count; $i++)
 		{
-			$wn = getparam('workername:'.$i, false);
+			$wn = urldecode(getparam('workername:'.$i, false));
 			$md = getparam('difficultydefault:'.$i, false);
 			if (!nuem($wn) && !nuem($md))
 			{