diff --git a/wp-activate.php b/wp-activate.php
index b51c81c91b..9dd61a2e39 100755
--- a/wp-activate.php
+++ b/wp-activate.php
@@ -38,7 +38,7 @@ get_header();
 			    <br /><input type="text" name="key" id="key" value="" size="50" />
 			</p>
 			<p class="submit">
-			    <input id="submit" type="submit" name="Submit" class="submit" value="<?php _e('Activate &raquo;') ?>" />
+			    <input id="submit" type="submit" name="Submit" class="submit" value="<?php esc_attr_e('Activate') ?>" />
 			</p>
 		</form>
 		
diff --git a/wp-admin/ms-admin.php b/wp-admin/ms-admin.php
index af407e814b..14e0b06df0 100644
--- a/wp-admin/ms-admin.php
+++ b/wp-admin/ms-admin.php
@@ -45,7 +45,7 @@ $title = __( 'Site Admin' );
 		<p>
 			<input type="hidden" name="action" value="users" />
 			<input type="text" name="s" value="" size="17" /> 
-			<input class="button" type="submit" name="submit" value="<?php _e("Search Users &raquo;"); ?>" />
+			<input class="button" type="submit" name="submit" value="<?php esc_attr_e("Search Users"); ?>" />
 		</p> 
 	</form>
 
@@ -53,7 +53,7 @@ $title = __( 'Site Admin' );
 		<p>
 			<input type="hidden" name="action" value="blogs" />
 			<input type="text" name="s" value="" size="17" />
-			<input class="button" type="submit" name="blog_name" value="<?php _e("Search Blogs &raquo;"); ?>" />
+			<input class="button" type="submit" name="blog_name" value="<?php esc_attr_e("Search Blogs"); ?>" />
 		</p>
 	</form>
 
diff --git a/wp-admin/ms-sites.php b/wp-admin/ms-sites.php
index 8fbffc94af..9eb464f67e 100644
--- a/wp-admin/ms-sites.php
+++ b/wp-admin/ms-sites.php
@@ -140,7 +140,7 @@ switch( $_GET['action'] ) {
 								</td> 
 							</tr> 
 						</table>
-						<p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php _esc_attr_e('Update Options &raquo;') ?>" /></p>
+						<p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php esc_attr_e('Update Options') ?>" /></p>
 			</div></div>
 			
 			<div id="blogedit_blogoptions" class="postbox " >
@@ -180,7 +180,7 @@ switch( $_GET['action'] ) {
 							} // End foreach
 							?>
 						</table>
-						<p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php esc_attr_e('Update Options &raquo;') ?>" /></p>
+						<p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php esc_attr_e('Update Options') ?>" /></p>
 			</div></div>
 			</div>
 			
@@ -214,7 +214,7 @@ switch( $_GET['action'] ) {
 					<tr><th style="font-weight:bold;"><?php _e('Theme'); ?></th></tr>
 					<?php echo $out; ?>
 				</table>
-				<p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php esc_attr_e('Update Options &raquo;') ?>" /></p>
+				<p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php esc_attr_e('Update Options') ?>" /></p>
 			</div></div>
 			<?php } ?>
 			
@@ -256,7 +256,7 @@ switch( $_GET['action'] ) {
 							echo '</tr>';
 						}
 						echo "</table>";
-						echo '<p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="' . esc_attr__('Update Options &raquo;') . '" /></p>';
+						echo '<p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="' . esc_attr__('Update Options') . '" /></p>';
 						echo "</div></div>";
 					}
 			?>
@@ -286,7 +286,7 @@ switch( $_GET['action'] ) {
 							</td>
 						</tr>
 					</table>
-				<p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php esc_attr_e('Update Options &raquo;') ?>" /></p>
+				<p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php esc_attr_e('Update Options') ?>" /></p>
 			</div></div>
 			
 			<div id="blogedit_miscoptions" class="postbox">
@@ -295,7 +295,7 @@ switch( $_GET['action'] ) {
 				<table class="form-table">
 						<?php do_action( 'wpmueditblogaction', $id ); ?>
 					</table>
-				<p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php esc_attr_e('Update Options &raquo;') ?>" /></p>
+				<p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php esc_attr_e('Update Options') ?>" /></p>
 			</div></div>
 			
 			</div>
diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index c0487d9ef8..4f0d1ab0f4 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -1895,10 +1895,10 @@ SITE_NAME
 			<p><?php printf(__('If you do not want to use your %s blog any more, you can delete it using the form below. When you click <strong>Delete My Blog</strong> you will be sent an email with a link in it. Click on this link to delete your blog.'), $current_site->site_name); ?></p>
 			<p><?php _e('Remember, once deleted your blog cannot be restored.') ?></p>
 			<form method='post' name='deletedirect'>
-			<input type="hidden" name="page" value="<?php echo $_GET['page'] ?>" />
+			<input type="hidden" name="page" value="<?php echo esc_attr($_GET['page']) ?>" />
 			<input type='hidden' name='action' value='deleteblog' />
 			<p><input id='confirmdelete' type='checkbox' name='confirmdelete' value='1' /> <label for='confirmdelete'><strong><?php printf( __("I'm sure I want to permanently disable my blog, and I am aware I can never get it back or use %s again."), $current_blog->domain); ?></strong></label></p>
-			<p class="submit"><input type='submit' value='<?php _e('Delete My Blog Permanently &raquo;') ?>' /></p>
+			<p class="submit"><input type='submit' value='<?php esc_attr_e('Delete My Blog Permanently') ?>' /></p>
 			</form>
 <?php
 		}
diff --git a/wp-signup.php b/wp-signup.php
index 519aee80cb..61abcc0757 100755
--- a/wp-signup.php
+++ b/wp-signup.php
@@ -66,9 +66,9 @@ function show_blog_form($blogname = '', $blog_title = '', $errors = '') {
 	<?php }
 
 	if( constant( "VHOST" ) == 'no' ) {
-		echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span><input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /><br />';
+		echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span><input name="blogname" type="text" id="blogname" value="'. esc_attr($blogname) .'" maxlength="50" /><br />';
 	} else {
-		echo '<input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /><span class="suffix_address">.' . $current_site->domain . $current_site->path . '</span><br />';
+		echo '<input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="50" /><span class="suffix_address">.' . $current_site->domain . $current_site->path . '</span><br />';
 	}
 	if ( !is_user_logged_in() ) {
 		print '(<strong>' . __( 'Your address will be ' );
@@ -86,7 +86,7 @@ function show_blog_form($blogname = '', $blog_title = '', $errors = '') {
 	<?php if ( $errmsg = $errors->get_error_message('blog_title') ) { ?>
 		<p class="error"><?php echo $errmsg ?></p>
 	<?php }
-	echo '<input name="blog_title" type="text" id="blog_title" value="'.wp_specialchars($blog_title, 1).'" /></p>';
+	echo '<input name="blog_title" type="text" id="blog_title" value="'.esc_attr($blog_title).'" /></p>';
 	?>
 
 	<div id="privacy">
@@ -123,7 +123,7 @@ function show_user_form($user_name = '', $user_email = '', $errors = '') {
 	if ( $errmsg = $errors->get_error_message('user_name') ) {
 		echo '<p class="error">'.$errmsg.'</p>';
 	}
-	echo '<input name="user_name" type="text" id="user_name" value="'.$user_name.'" maxlength="50" /><br />';
+	echo '<input name="user_name" type="text" id="user_name" value="'. esc_attr($user_name) .'" maxlength="50" /><br />';
 	_e('(Must be at least 4 characters, letters and numbers only.)');
 	?>
 
@@ -131,7 +131,7 @@ function show_user_form($user_name = '', $user_email = '', $errors = '') {
 	<?php if ( $errmsg = $errors->get_error_message('user_email') ) { ?>
 		<p class="error"><?php echo $errmsg ?></p>
 	<?php } ?>		
-	<input name="user_email" type="text" id="user_email" value="<?php  echo wp_specialchars($user_email, 1) ?>" maxlength="200" /><br /><?php _e('(We&#8217;ll send your password to this address, so <strong>triple-check it</strong>.)') ?>
+	<input name="user_email" type="text" id="user_email" value="<?php  echo esc_attr($user_email) ?>" maxlength="200" /><br /><?php _e('(We&#8217;ll send your password to this address, so <strong>triple-check it</strong>.)') ?>
 	<?php
 	if ( $errmsg = $errors->get_error_message('generic') ) {
 		echo '<p class="error">'.$errmsg.'</p>';
@@ -182,7 +182,7 @@ function signup_another_blog($blogname = '', $blog_title = '', $errors = '') {
 		<input type="hidden" name="stage" value="gimmeanotherblog" />
 		<?php do_action( "signup_hidden_fields" ); ?>
 		<?php show_blog_form($blogname, $blog_title, $errors); ?>
-		<p class="submit"><input type="submit" name="submit" class="submit" value="<?php _e('Create Blog &raquo;') ?>" /></p>
+		<p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Create Blog') ?>" /></p>
 	</form>
 	<?php
 }
@@ -259,7 +259,7 @@ function signup_user($user_name = '', $user_email = '', $errors = '') {
 		<?php } ?>
 		</p>
 		
-		<p class="submit"><input type="submit" name="submit" class="submit" value="<?php _e('Next &raquo;') ?>" /></p>
+		<p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Next') ?>" /></p>
 	</form>
 	<?php
 }
@@ -311,11 +311,11 @@ function signup_blog($user_name = '', $user_email = '', $blogname = '', $blog_ti
 	?>
 	<form id="setupform" method="post" action="wp-signup.php">
 		<input type="hidden" name="stage" value="validate-blog-signup" />
-		<input type="hidden" name="user_name" value="<?php echo $user_name ?>" />
-		<input type="hidden" name="user_email" value="<?php echo $user_email ?>" />
+		<input type="hidden" name="user_name" value="<?php echo esc_attr($user_name) ?>" />
+		<input type="hidden" name="user_email" value="<?php echo esc_attr($user_email) ?>" />
 		<?php do_action( "signup_hidden_fields" ); ?>
 		<?php show_blog_form($blogname, $blog_title, $errors); ?>
-		<p class="submit"><input type="submit" name="submit" class="submit" value="<?php _e('Signup &raquo;') ?>" /></p>
+		<p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Signup') ?>" /></p>
 	</form>
 	<?php
 }