diff --git a/templates/password-change.php b/templates/password-change.php
index 46bf34a6..322a2e65 100644
--- a/templates/password-change.php
+++ b/templates/password-change.php
@@ -57,12 +57,16 @@ if ( ! defined( 'ABSPATH' ) ) {
 			foreach ( $fields as $key => $data ) {
 				$output .= UM()->fields()->edit_field( $key, $data );
 			}
-			echo $output; ?>
+			echo wp_kses( $output, UM()->get_allowed_html( 'templates' ) ); ?>
 
 			<div class="um-col-alt um-col-alt-b">
 
 				<div class="um-center">
-					<input type="submit" value="<?php esc_attr_e( 'Change password', 'ultimate-member' ); ?>" class="um-button" id="um-submit-btn" />
+					<?php if ( get_user_meta( um_user( 'ID' ), 'um_password_generated', true ) ) { ?>
+						<input type="submit" value="<?php esc_attr_e( 'Set password', 'ultimate-member' ); ?>" class="um-button" id="um-submit-btn" />
+					<?php } else { ?>
+						<input type="submit" value="<?php esc_attr_e( 'Change password', 'ultimate-member' ); ?>" class="um-button" id="um-submit-btn" />
+					<?php } ?>
 				</div>
 
 				<div class="um-clear"></div>