diff --git a/mod/appman.php b/mod/appman.php
index a782cb0eb..0cc108079 100644
--- a/mod/appman.php
+++ b/mod/appman.php
@@ -77,7 +77,7 @@ logger('content');
 		);
 		if($r)
 			$app = $r[0];
-		$embed = array('embed', t('Embed code'), app_encode($app,true),'');
+		$embed = array('embed', t('Embed code'), app_encode($app,true),'', 'onclick="this.select();"');
 
 	}
 			
diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl
index 98be8f138..b454045c0 100755
--- a/view/tpl/field_textarea.tpl
+++ b/view/tpl/field_textarea.tpl
@@ -1,5 +1,5 @@
 	<div class='field textarea'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<textarea name='{{$field.0}}' id='id_{{$field.0}}'>{{$field.2}}</textarea>
+		<textarea name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea>
 		<span class='field_help'>{{$field.3}}</span>
 	</div>