diff --git a/wp-admin/includes/post-formats.php b/wp-admin/includes/post-formats.php
index 5bd89ea64b..0364f5d416 100644
--- a/wp-admin/includes/post-formats.php
+++ b/wp-admin/includes/post-formats.php
@@ -69,7 +69,12 @@ $format_meta = get_post_format_meta( $post_ID );
 			?>
 		</div>
 		<?php endif; ?>
-		<label for="wp_format_video"><?php _e( 'Video embed code or URL' ); ?></label>
+		<label for="wp_format_video"><?php
+			if ( current_user_can( 'unfiltered_html' ) )
+				_e( 'Video embed code or URL' );
+			else
+				_e( 'Video URL' );
+		?></label>
 		<textarea id="wp_format_video" type="text" name="_wp_format_video" class="widefat"><?php esc_html_e( $format_meta['video'] ); ?></textarea>
 		<div data-format="video" class="wp-format-media-holder hide-if-no-js<?php if ( ! $image ) echo ' empty'; ?>">
 			<a href="#" class="wp-format-media-select"
@@ -103,7 +108,12 @@ $format_meta = get_post_format_meta( $post_ID );
 			?>
 		</div>
 		<?php endif; ?>
-		<label for="wp_format_audio"><?php _e( 'Audio embed code or URL' ); ?></label>
+		<label for="wp_format_audio"><?php
+			if ( current_user_can( 'unfiltered_html' ) )
+				_e( 'Audio embed code or URL' );
+			else
+				_e( 'Audio URL' );
+		?></label>
 		<textarea id="wp_format_audio" name="_wp_format_audio" class="widefat"><?php esc_html_e( $format_meta['audio'] );
 ?></textarea>
 		<div data-format="audio" class="wp-format-media-holder hide-if-no-js<?php if ( empty( $format_meta['audio'] ) ) echo ' empty'; ?>">
diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index 73a1a7261a..1b5ff0ea60 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -203,8 +203,12 @@ function edit_post( $post_data = null ) {
 	$format_keys = array( 'quote', 'quote_source', 'image', 'gallery', 'audio', 'video' );
 
 	foreach ( $format_keys as $key ) {
-		if ( isset( $post_data[ '_wp_format_' . $key ] ) )
-		 	update_post_meta( $post_ID, '_wp_format_' . $key, wp_filter_post_kses( $post_data[ '_wp_format_' . $key ] ) );
+		if ( isset( $post_data[ '_wp_format_' . $key ] ) ) {
+			if ( current_user_can( 'unfiltered_html' ) )
+				update_post_meta( $post_ID, '_wp_format_' . $key, $post_data[ '_wp_format_' . $key ] );
+			else
+				update_post_meta( $post_ID, '_wp_format_' . $key, wp_filter_post_kses( $post_data[ '_wp_format_' . $key ] ) );
+		}
 	}
 
 	// Meta Stuff