diff --git a/server.html b/server.html
index e8a0a30c..d37a5be2 100644
--- a/server.html
+++ b/server.html
@@ -323,6 +323,12 @@ label,
    text-transform: uppercase;
 }
 
+
+.nocapitals
+{
+   text-transform: none;
+}
+
 #editserver label input
 {
    text-transform: none;
@@ -820,9 +826,12 @@ if(confirmDelete('Are you sure you want to delete this protocol?') == true)
                   $tr.append( $('<td>').text( TypeofResource( cstr.channel.URL ) ) );
 
 
-                  $tr.append( $('<td>').append( $('<button>').text('embed') ) );
-                  // TODO do something when pressed!
-                  // FIXME need Thulinma's embed code
+                  $tr.append( $('<td>').append( $('<button>').text('embed').click(function()
+                  {
+                     var sname = $(this).parent().parent().attr('id').replace('stream-', '');
+                     showTab('embed', sname);
+                  }) ) );
+
 
                   $tr.append( $('<td>').text(cstr.name) );
 
@@ -951,7 +960,7 @@ if(confirmDelete('Are you sure you want to delete this protocol?') == true)
 
                      if(streamname == 'new')
                      {
-                        streamname = n.val().replace(' ', '-');
+                        streamname = n.val().replace(/ /g, '-');
                      }
 
                      if(!settings.settings.streams)
@@ -974,6 +983,21 @@ if(confirmDelete('Are you sure you want to delete this protocol?') == true)
 
 
 
+case 'embed':
+   // FIXME use server URLs from stream_links.js
+
+   var url = settings.settings.streams[streamname].channel.URL;
+
+   $('#page').append( $('<p>').text('This feature is not yet implemented.') );
+   $('#page').append( $('<p>').text('The URL for this stream is ').append( $('<span>').attr('class', 'nocapitals').text(url) ) );
+
+
+   break;
+
+
+
+
+
             case 'limits':
                $table = $('<table>');
                $table.html("<thead><th>Type</th><th>Hard/soft</th><th>Value</th><th>applies to</th><th>Action</th></thead>");