diff --git a/src/rich_text_editor/config/config.js b/src/rich_text_editor/config/config.js
index 3ec451379..b4b552da9 100644
--- a/src/rich_text_editor/config/config.js
+++ b/src/rich_text_editor/config/config.js
@@ -24,7 +24,7 @@ define(function () {
 			command: 'insertHTML',
 			title: 'Link',
 			class: 'fa fa-link',
-			args: '<a href="">${content}</a>',
+			args: '<a class="link" href="">${content}</a>',
 	 	}/*,{
 	 		command: 'fontSize',
 	 		options: [
diff --git a/src/trait_manager/view/TraitView.js b/src/trait_manager/view/TraitView.js
index 2463c00de..639eda3f9 100644
--- a/src/trait_manager/view/TraitView.js
+++ b/src/trait_manager/view/TraitView.js
@@ -75,14 +75,17 @@ define(['backbone'], function (Backbone) {
 		getInputEl: function() {
 			if(!this.$input){
 				var md = this.model;
+				var trg = this.target;
 				var name = md.get('name');
 				var opts = {
 					placeholder: md.get('placeholder') || md.get('default'),
-					type: md.get('type') || 'text',
-					value: md.get('value')
+					type: md.get('type') || 'text'
 				};
 				if(md.get('changeProp')){
-					opts.value = this.target.get(name);
+					opts.value = trg.get(name);
+				}else{
+					var attrs = trg.get('attributes');
+					opts.value = md.get('value') || attrs[name];
 				}
 				if(md.get('min'))
 					opts.min = md.get('min');